X-Git-Url: https://git.grml.org/?p=grml-debootstrap.git;a=blobdiff_plain;f=chroot-script;h=289773ba02a597b0a6ac0dc3f814b1171070f746;hp=751eac3f714d0568c5b2ab6d88c126406fce12e6;hb=491c75a1d40b96efd398d689d40d8b8a0d165c87;hpb=4f9ea9128412213f405416da7f15c3f329857f12 diff --git a/chroot-script b/chroot-script index 751eac3..289773b 100755 --- a/chroot-script +++ b/chroot-script @@ -18,19 +18,19 @@ # use aptitude only if it's available if [ -x /usr/bin/aptitude ] ; then - APTUPDATE='aptitude update' + APTUPDATE="aptitude update $DPKG_OPTIONS" # Debian ISOs do not contain signed Release files if [ -n "$ISO" ] ; then APTINSTALL="aptitude -y --allow-untrusted --without-recommends install $DPKG_OPTIONS" - APTUPGRADE='aptitude -y --allow-untrusted safe-upgrade' + APTUPGRADE="aptitude -y --allow-untrusted safe-upgrade $DPKG_OPTIONS" else APTINSTALL="aptitude -y --without-recommends install $DPKG_OPTIONS" - APTUPGRADE='aptitude -y safe-upgrade' + APTUPGRADE="aptitude -y safe-upgrade $DPKG_OPTIONS" fi else APTINSTALL="apt-get --force-yes -y --no-install-recommends install $DPKG_OPTIONS" - APTUPDATE='apt-get update' - APTUPGRADE='apt-get --force-yes -y upgrade' + APTUPDATE="apt-get update $DPKG_OPTIONS" + APTUPGRADE="apt-get --force-yes -y upgrade $DPKG_OPTIONS" fi if [ -z "$STAGES" ] ; then @@ -86,9 +86,19 @@ chrootmirror() { fi fi + # LTS support + case "$RELEASE" in + squeeze) + if [ -n "$MIRROR" ] ; then + echo "Release matching $RELEASE - enabling LTS support in sources.list" + echo "deb $MIRROR ${RELEASE}-lts $COMPONENTS" >> /etc/apt/sources.list + fi + ;; + esac + # add security.debian.org: case "$RELEASE" in - unstable|sid) ;; # no security pool available + unstable|sid|lenny) ;; # no security pool available *) echo "Adding security.debian.org to sources.list." echo "deb http://security.debian.org ${RELEASE}/updates $COMPONENTS" >> /etc/apt/sources.list @@ -136,9 +146,9 @@ grmlrepos() { EOF fi - if apt-get update ; then - apt-get -y --allow-unauthenticated install grml-debian-keyring - apt-get update + if apt-get update $DPKG_OPTIONS; then + apt-get -y --allow-unauthenticated install grml-debian-keyring $DPKG_OPTIONS + apt-get update $DPKG_OPTIONS else # make sure we have the keys available for aptitude gpg --keyserver subkeys.pgp.net --recv-keys F61E2E7CECDEA787 @@ -223,7 +233,7 @@ upgrade_system() { if [ "$UPGRADE_SYSTEM" = "yes" ] ; then echo "Running update + upgrade" $APTUPDATE - $APTUPGRADE + DEBIAN_FRONTEND=$DEBIAN_FRONTEND $APTUPGRADE else echo "Not running update + upgrade as \$UPDATE_AND_UPGRADE is not set to 'yes'." fi @@ -234,7 +244,7 @@ upgrade_system() { remove_apt_cache() { if [ "$RM_APTCACHE" = 'yes' ] ; then echo "Cleaning apt cache." - apt-get clean + apt-get clean $DPKG_OPTIONS else echo "Not cleaning apt cache as \$RM_APTCACHE is unset." fi @@ -292,7 +302,7 @@ get_kernel_version() { fi case $ARCH in - i386) KARCH=i686 ;; + i386) KARCH=686 ;; amd64) KARCH=amd64 ;; *) echo "Only i386 and amd64 are currently supported" >&2 @@ -311,12 +321,19 @@ get_kernel_version() { # install kernel packages {{{ kernel() { + if [ -n "$NOKERNEL" ] ; then + echo "Skipping installation of kernel packages as requested via --nokernel" + return 0 + fi + $APTUPDATE KVER=$(get_kernel_version) if [ -n "$KVER" ] ; then # note: install busybox to be able to debug initramfs KERNELPACKAGES="linux-image-$KVER linux-headers-$KVER busybox firmware-linux-free firmware-linux" DEBIAN_FRONTEND=$DEBIAN_FRONTEND $APTINSTALL $KERNELPACKAGES + else + echo "Warning: Could not find a kernel for your system. Your system won't be able to boot itself!" fi } # }}} @@ -407,21 +424,16 @@ EOF } # }}} -# set up /etc/network/interfaces {{{ -interfaces() { - if ! [ -r /etc/network/interfaces ] || ! grep -q "auto lo" /etc/network/interfaces ; then - echo "Setting up /etc/network/interfaces" - cat >> /etc/network/interfaces << EOF - -# loopback device: -iface lo inet loopback -auto lo - -# eth0: -# iface eth0 inet dhcp -# auto eth0 +# set default locales {{{ +default_locales() { + if [ -n "$DEFAULT_LOCALES" ] ; then + if ! [ -x /usr/sbin/update-locale ] ; then + echo "Warning: update-locale executable not available (no locales package installed?)" + echo "Ignoring request to run update-locale for $DEFAULT_LOCALES therefore" + return 0 + fi -EOF + /usr/sbin/update-locale LANGUAGE="$DEFAULT_LANGUAGE" LANG="$DEFAULT_LOCALES" fi } # }}} @@ -450,7 +462,7 @@ proc /proc proc defaults 0 0 # some other examples: # /dev/sda2 none swap sw,pri=0 0 0 # /dev/hda1 /Grml ext3 dev,suid,user,noauto 0 2 -# //1.2.3.4/pub /smb/pub smbfs defaults,user,noauto,uid=grml,gid=grml 0 0 +# //1.2.3.4/pub /smb/pub cifs user,noauto,uid=grml,gid=grml 0 0 # linux:/pub /beer nfs defaults 0 0 # tmpfs /tmp tmpfs size=300M 0 0 # /dev/sda5 none swap sw 0 0 @@ -487,6 +499,20 @@ hostname() { sed -i "s/^inet_interfaces = .*/inet_interfaces = loopback-only/" /etc/postfix/main.cf grep -q inet_interfaces /etc/postfix/main.cf || echo 'inet_interfaces = loopback-only' >> /etc/postfix/main.cf fi + if [ -r /etc/mailname ] ; then + # adjust /etc/mailname + local etc_mail_domain=$(/bin/dnsdomainname 2>/dev/null || echo localdomain) + case "$HOSTNAME" in + *.*) + local mailname="$HOSTNAME" + ;; + *) + local mailname="${HOSTNAME}.${etc_mail_domain}" + ;; + esac + echo "Setting mailname to ${mailname}" + echo "$mailname" > /etc/mailname + fi fi } # }}} @@ -605,8 +631,8 @@ trap signal_handler HUP INT QUIT TERM install_policy_rcd for i in chrootmirror grmlrepos backportrepos kernelimg_conf \ - kernel packages extrapackages reconfigure hosts interfaces \ - timezone fstab hostname initrd grub_install passwords \ + kernel packages extrapackages reconfigure hosts \ + default_locales timezone fstab hostname initrd grub_install passwords \ custom_scripts upgrade_system remove_apt_cache services \ remove_chrootmirror; do if stage $i ; then