diff --git a/bare_image.sh b/bare_image.sh index c05914667fde58371e2d5ad564292647b6285f4f..42667b5a39ea5f12103ffa340d83952cfa3fa5f6 100755 --- a/bare_image.sh +++ b/bare_image.sh @@ -73,7 +73,6 @@ minimal_armel () { include_firmware="${include_firmware}" chroot_very_small_image="${chroot_very_small_image}" - chroot_no_lsb_release="${chroot_no_lsb_release}" chroot_rcnee_startup_scripts="${chroot_rcnee_startup_scripts}" chroot_ENABLE_DEB_SRC="${chroot_ENABLE_DEB_SRC}" chroot_KERNEL_HTTP_DIR="${chroot_KERNEL_HTTP_DIR}" @@ -135,7 +134,6 @@ is_ubuntu () { deb_components="main universe multiverse" pkg_list - chroot_no_lsb_release="Ubuntu" } is_debian () { @@ -151,7 +149,6 @@ is_debian () { pkg_list exclude_pkgs_list="aptitude,aptitude-common,groff-base,info,install-info,libept1.4.12,manpages,man-db,tasksel,tasksel-data,vim-common,vim-tiny,wget,whiptail" chroot_very_small_image="enable" - chroot_no_lsb_release="Debian" } #13.04 diff --git a/base_image.sh b/base_image.sh index 573492a0683eed8fba80fbef7b86939bbd4cfdad..2cb0c1a00f8d340b38a7a2c19509955b7d5bedb0 100755 --- a/base_image.sh +++ b/base_image.sh @@ -73,7 +73,6 @@ minimal_armel () { include_firmware="${include_firmware}" chroot_very_small_image="${chroot_very_small_image}" - chroot_no_lsb_release="${chroot_no_lsb_release}" chroot_rcnee_startup_scripts="${chroot_rcnee_startup_scripts}" chroot_ENABLE_DEB_SRC="${chroot_ENABLE_DEB_SRC}" chroot_KERNEL_HTTP_DIR="${chroot_KERNEL_HTTP_DIR}" @@ -114,7 +113,7 @@ pkg_list () { if [ ! "x${no_pkgs}" = "xenable" ] ; then . ${DIR}/var/pkg_list.sh - include_pkgs_list="initramfs-tools,lsb-release,locales,sudo" + include_pkgs_list="initramfs-tools,locales,sudo" if [ "x${include_firmware}" = "xenable" ] ; then base_pkg_list="${base_pkgs} ${extra_pkgs} ${firmware_pkgs}" @@ -135,7 +134,6 @@ is_ubuntu () { deb_components="main universe multiverse" pkg_list -# chroot_no_lsb_release="Ubuntu" } is_debian () { @@ -151,7 +149,6 @@ is_debian () { pkg_list exclude_pkgs_list="" # chroot_very_small_image="enable" -# chroot_no_lsb_release="Debian" } #13.04 diff --git a/build_image.sh b/build_image.sh index e0a124cc698df0b47362a650c2964fb50a367992..ffae3b9237b18408336415342f6e75180f602222 100755 --- a/build_image.sh +++ b/build_image.sh @@ -87,7 +87,6 @@ minimal_armel () { include_firmware="${include_firmware}" chroot_very_small_image="${chroot_very_small_image}" - chroot_no_lsb_release="${chroot_no_lsb_release}" chroot_rcnee_startup_scripts="${chroot_rcnee_startup_scripts}" chroot_ENABLE_DEB_SRC="${chroot_ENABLE_DEB_SRC}" chroot_KERNEL_HTTP_DIR="${chroot_KERNEL_HTTP_DIR}" @@ -164,7 +163,7 @@ pkg_list () { if [ ! "x${no_pkgs}" = "xenable" ] ; then . ${DIR}/var/pkg_list.sh - include_pkgs_list="git-core,initramfs-tools,lsb-release,locales,sudo,u-boot-tools,wget" + include_pkgs_list="git-core,initramfs-tools,locales,sudo,u-boot-tools,wget" if [ "x${include_firmware}" = "xenable" ] ; then base_pkg_list="${base_pkgs} ${extra_pkgs} ${firmware_pkgs}" @@ -185,7 +184,6 @@ is_ubuntu () { deb_components="main universe multiverse" pkg_list -# chroot_no_lsb_release="Ubuntu" } is_debian () { @@ -201,7 +199,6 @@ is_debian () { pkg_list exclude_pkgs_list="" # chroot_very_small_image="enable" -# chroot_no_lsb_release="Debian" } #12.10 diff --git a/scripts/chroot.sh b/scripts/chroot.sh index 6d1080159a038d474c36bc6fad98b7dde71fd93c..25af873ff2106d888a0253d99baccdc4f852a911 100755 --- a/scripts/chroot.sh +++ b/scripts/chroot.sh @@ -267,6 +267,10 @@ debian) sudo mv /tmp/${wfile} ${tempdir}/etc/init.d/${wfile} + #Backward compatibility, as setup_sdcard.sh expects [lsb_release -si > /etc/rcn-ee.conf] + echo "distro=Debian" > /tmp/rcn-ee.conf + sudo mv /tmp/rcn-ee.conf ${tempdir}/etc/rcn-ee.conf + ;; ubuntu) wfile="boot_scripts.conf" @@ -318,6 +322,10 @@ ubuntu) sudo sed -i -e 's:sleep 59:#sleep 59:g' ${tempdir}/etc/init/failsafe.conf fi + #Backward compatibility, as setup_sdcard.sh expects [lsb_release -si > /etc/rcn-ee.conf] + echo "distro=Ubuntu" > /tmp/rcn-ee.conf + sudo mv /tmp/rcn-ee.conf ${tempdir}/etc/rcn-ee.conf + ;; esac @@ -342,20 +350,6 @@ cat > ${DIR}/chroot_script.sh <<-__EOF__ fi } - install_chroot_pkgs () { - if [ "x${chroot_no_lsb_release}" = "x" ] ; then - apt-get update - packages="lsb-release" - for pkg in \${packages} ; do check_n_install ; done - - distro="\$(lsb_release -si)" - echo "distro=\${distro}" > /etc/rcn-ee.conf - else - distro="${chroot_no_lsb_release}" - echo "distro=${chroot_no_lsb_release}" > /etc/rcn-ee.conf - fi - } - stop_init () { cat > /usr/sbin/policy-rc.d <<EOF #!/bin/sh @@ -363,6 +357,9 @@ cat > ${DIR}/chroot_script.sh <<-__EOF__ EOF chmod +x /usr/sbin/policy-rc.d + #set distro: + . /etc/rcn-ee.conf + if [ "x\${distro}" = "xUbuntu" ] ; then dpkg-divert --local --rename --add /sbin/initctl ln -s /bin/true /sbin/initctl @@ -567,8 +564,6 @@ cat > ${DIR}/chroot_script.sh <<-__EOF__ } #cat /chroot_script.sh - - install_chroot_pkgs stop_init install_pkg_updates diff --git a/var/pkg_list.sh b/var/pkg_list.sh index 76b3b9d26ec6208ad6052db44713cccdcd8880fa..c806fac4a99ca332bd85f457c4fbb18d7ed1d2b6 100755 --- a/var/pkg_list.sh +++ b/var/pkg_list.sh @@ -1,7 +1,7 @@ #!/bin/sh -e #Note: These will be auto installed by chroot.sh script: -#lsb-release initramfs-tools sudo wget +#initramfs-tools sudo wget #Base base_pkgs="nano pastebinit"