diff --git a/bare_image.sh b/bare_image.sh index 7d58cefbc56914a433849f38e5ed0786eb42d0f5..dea817dfbf4752cc3f74affed6d8f845dde569a3 100755 --- a/bare_image.sh +++ b/bare_image.sh @@ -73,7 +73,6 @@ minimal_armel () { chroot_very_small_image="${chroot_very_small_image}" chroot_enable_localepurge="${chroot_enable_localepurge}" chroot_enable_deborphan="${chroot_enable_deborphan}" - chroot_enable_hardlink="${chroot_enable_hardlink}" chroot_no_lsb_release="${chroot_no_lsb_release}" chroot_no_sudo="${chroot_no_sudo}" chroot_rcnee_startup_scripts="${chroot_rcnee_startup_scripts}" @@ -152,7 +151,6 @@ is_debian () { chroot_very_small_image="enable" chroot_enable_localepurge="enable" chroot_enable_deborphan="enable" -# chroot_enable_hardlink="enable" chroot_no_lsb_release="Debian" chroot_no_sudo="enable" } diff --git a/base_image.sh b/base_image.sh index 8b223b7c9f4a1d48f138f5c1650cb7c4c7181108..078961cee625c4aeeabea851d47a7ddb4bcaac26 100755 --- a/base_image.sh +++ b/base_image.sh @@ -73,7 +73,6 @@ minimal_armel () { chroot_very_small_image="${chroot_very_small_image}" chroot_enable_localepurge="${chroot_enable_localepurge}" chroot_enable_deborphan="${chroot_enable_deborphan}" - chroot_enable_hardlink="${chroot_enable_hardlink}" chroot_no_lsb_release="${chroot_no_lsb_release}" chroot_no_sudo="${chroot_no_sudo}" chroot_rcnee_startup_scripts="${chroot_rcnee_startup_scripts}" @@ -152,7 +151,6 @@ is_debian () { # chroot_very_small_image="enable" # chroot_enable_localepurge="enable" # chroot_enable_deborphan="enable" -# chroot_enable_hardlink="enable" # chroot_no_lsb_release="Debian" # chroot_no_sudo="enable" } diff --git a/build_image.sh b/build_image.sh index 76449b540b621d0f513943c90e8f56240b9a0fd9..108792d8472c9be081a017d7ab2240acdf6ff9fc 100755 --- a/build_image.sh +++ b/build_image.sh @@ -86,7 +86,6 @@ minimal_armel () { chroot_very_small_image="${chroot_very_small_image}" chroot_enable_localepurge="${chroot_enable_localepurge}" chroot_enable_deborphan="${chroot_enable_deborphan}" - chroot_enable_hardlink="${chroot_enable_hardlink}" chroot_no_lsb_release="${chroot_no_lsb_release}" chroot_no_sudo="${chroot_no_sudo}" chroot_rcnee_startup_scripts="${chroot_rcnee_startup_scripts}" @@ -201,7 +200,6 @@ is_debian () { # chroot_very_small_image="enable" # chroot_enable_localepurge="enable" # chroot_enable_deborphan="enable" -# chroot_enable_hardlink="enable" # chroot_no_lsb_release="Debian" # chroot_no_sudo="enable" } diff --git a/scripts/chroot.sh b/scripts/chroot.sh index 121a1f10d4c08bdca89c7338c4d3d58d10b94731..7753d9afd1c96819311aaa28ab366031d0bde268 100755 --- a/scripts/chroot.sh +++ b/scripts/chroot.sh @@ -401,19 +401,6 @@ cat > ${DIR}/chroot_script.sh <<-__EOF__ apt-get clean } - run_hardlink () { - packages="hardlink" - for pkg in \${packages} ; do check_n_install ; done - /usr/bin/hardlink -t /usr/share/doc - - echo "// Hardlink identical docs, changelogs, copyrights, examples, etc" > /etc/apt/apt.conf.d/98-hardlink-doc - echo "" >> /etc/apt/apt.conf.d/98-hardlink-doc - echo "DPkg" >> /etc/apt/apt.conf.d/98-hardlink-doc - echo "{" >> /etc/apt/apt.conf.d/98-hardlink-doc - echo "Post-Invoke {\"if [ -x /usr/bin/hardlink ]; then /usr/bin/hardlink -t /usr/share/doc; else exit 0; fi\";};" >> /etc/apt/apt.conf.d/98-hardlink-doc - echo "};" >> /etc/apt/apt.conf.d/98-hardlink-doc - } - dl_pkg_src () { mkdir -p /tmp/pkg_src/ cd /tmp/pkg_src/ @@ -589,9 +576,6 @@ cat > ${DIR}/chroot_script.sh <<-__EOF__ if [ "x${chroot_enable_deborphan}" = "xenable" ] ; then run_deborphan fi - if [ "x${chroot_enable_hardlink}" = "xenable" ] ; then - run_hardlink - fi add_user if [ "x${chroot_rcnee_startup_scripts}" = "xenable" ] ; then