X-Git-Url: https://git.grml.org/?a=blobdiff_plain;f=chroot-script;h=a033d8d6bcbf30e06910c26987f4e8010406c74d;hb=4c49de9d47fef1e743d87bd7bd08fd4ac7d36f9c;hp=4a20fa7c9ecc818cd62747c3d76f1f017db2e621;hpb=be5760d9fb97ac3663c1e6e3bd1787e9e8584676;p=grml-debootstrap.git diff --git a/chroot-script b/chroot-script index 4a20fa7..a033d8d 100755 --- a/chroot-script +++ b/chroot-script @@ -2,7 +2,7 @@ # Filename: /etc/debootstrap/chroot-script # Purpose: script executed in chroot when installing Debian via grml-debootstrap # Authors: grml-team (grml.org), (c) Michael Prokop -# Bug-Reports: see http://grml.org/bugs/ +# Bug-Reports: see https://grml.org/bugs/ # License: This file is licensed under the GPL v2. ################################################################################ # GRML_CHROOT_SCRIPT_MARKER - do not remove this line unless you want to keep @@ -75,8 +75,8 @@ askpass() { # define chroot mirror {{{ chrootmirror() { - if [ -n "$KEEP_SRC_LIST" ] ; then - echo "KEEP_SRC_LIST has been set, skipping chrootmirror stage." + if [ "$KEEP_SRC_LIST" = "yes" ] ; then + echo "KEEP_SRC_LIST has been enabled, skipping chrootmirror stage." return fi @@ -113,18 +113,24 @@ chrootmirror() { # add security.debian.org: case "$RELEASE" in unstable|sid|lenny) ;; # no security pool available - *) + squeeze|wheezy|jessie|stretch|buster) echo "Adding security.debian.org to sources.list." echo "deb http://security.debian.org ${RELEASE}/updates $COMPONENTS" >> /etc/apt/sources.list ;; + *) + # bullseye and newer releases use a different repository layout, see + # https://lists.debian.org/debian-devel-announce/2019/07/msg00004.html + echo "Adding security.debian.org/debian-security to sources.list." + echo "deb http://security.debian.org/debian-security ${RELEASE}-security $COMPONENTS" >> /etc/apt/sources.list + ;; esac } # }}} # remove local chroot mirror {{{ remove_chrootmirror() { - if [ -n "$KEEP_SRC_LIST" ] ; then - echo "KEEP_SRC_LIST has been set, skipping remove_chrootmirror stage." + if [ "$KEEP_SRC_LIST" = "yes" ] ; then + echo "KEEP_SRC_LIST has been enabled, skipping remove_chrootmirror stage." return fi @@ -146,75 +152,59 @@ remove_chrootmirror() { # set up grml repository {{{ grmlrepos() { - if [ -n "$GRMLREPOS" ] ; then - # user might have provided their own apt sources.list - if ! grep -q grml /etc/apt/sources.list.d/grml.list 2>/dev/null ; then - cat >> /etc/apt/sources.list.d/grml.list << EOF + if [ -z "$GRMLREPOS" ] ; then + return 0 + fi + + # user might have provided their own apt sources configuration + if [ -r /etc/apt/sources.list.d/grml.list ] ; then + echo "File /etc/apt/sources.list.d/grml.list exists already, not modifying." + else + echo "Setting up /etc/apt/sources.list.d/grml.list." + cat > /etc/apt/sources.list.d/grml.list << EOF # grml: stable repository: - deb http://deb.grml.org/ grml-stable main - deb-src http://deb.grml.org/ grml-stable main + deb [signed-by=/usr/share/keyrings/grml-archive-keyring.gpg] http://deb.grml.org/ grml-stable main + deb-src [signed-by=/usr/share/keyrings/grml-archive-keyring.gpg] http://deb.grml.org/ grml-stable main # grml: testing/development repository: - deb http://deb.grml.org/ grml-testing main - deb-src http://deb.grml.org/ grml-testing main + deb [signed-by=/usr/share/keyrings/grml-archive-keyring.gpg] http://deb.grml.org/ grml-testing main + deb-src [signed-by=/usr/share/keyrings/grml-archive-keyring.gpg] http://deb.grml.org/ grml-testing main EOF - fi - - # shellcheck disable=SC2086 - if apt-get update $DPKG_OPTIONS; then - # shellcheck disable=SC2086 - apt-get -y --allow-unauthenticated install grml-debian-keyring $DPKG_OPTIONS - # shellcheck disable=SC2086 - apt-get update $DPKG_OPTIONS - else - # make sure we have the keys available for aptitude - gpg --keyserver subkeys.pgp.net --recv-keys 709BCE51568573EBC160E590F61E2E7CECDEA787 - gpg --export 709BCE51568573EBC160E590F61E2E7CECDEA787 | apt-key add - || true # not yet sure - # why it's necessary, sometimes we get an error even though it works [mika] - fi - - # make sure we install packages from Grml's pool only if not available - # from Debian! - if ! grep -q grml /etc/apt/preferences 2>/dev/null ; then - cat >> /etc/apt/preferences << EOF -// debian pool (default): -Package: * -Pin: release o=Debian -Pin-Priority: 996 + fi -// main grml-repository: + # make sure we install packages from Grml's pool only if not available from Debian + if [ -r /etc/apt/preferences.d/grml.pref ] ; then + echo "File /etc/apt/preferences.d/grml.pref exists already, not modifying." + else + echo "Setting up /etc/apt/preferences.d/grml.pref." + cat > /etc/apt/preferences.d/grml.pref << EOF +Explanation: use Grml repository only after Debian ones Package: * Pin: origin deb.grml.org -Pin-Priority: 991 +Pin-Priority: 100 EOF - fi fi -} -# }}} -# check available backports release version {{{ -checkbackports() { - wget -q -O/dev/null "http://backports.debian.org/debian-backports/dists/${1}-backports/Release" + apt-get update -o Acquire::AllowInsecureRepositories=1 + apt-get -y --allow-unauthenticated install grml-debian-keyring + apt-get update + + if [ "$(dpkg-query -f "\${db:Status-Status} \${db:Status-Eflag}" -W grml-debian-keyring 2>/dev/null)" != 'installed ok' ]; then + echo "Error: installation of grml-debian-keyring failed." >&2 + exit 1 + fi } # }}} # feature to provide Debian backports repos {{{ backportrepos() { - if [ -n "$BACKPORTREPOS" ] ; then - if ! checkbackports "$RELEASE" ; then - echo "Backports for ${RELEASE} are not available." >&2 - exit 1 - else - # user might have provided their own apt sources.list - if ! grep -q backports /etc/apt/sources.list.d/backports.list 2>/dev/null ; then - cat >> /etc/apt/sources.list.d/backports.list << EOF + if [ -n "$BACKPORTREPOS" ] ; then + cat >> /etc/apt/sources.list.d/backports.list << EOF # debian backports: ${RELEASE}-backports repository: -deb http://backports.debian.org/debian-backports ${RELEASE}-backports main -deb-src http://backports.debian.org/debian-backports ${RELEASE}-backports main +deb ${MIRROR} ${RELEASE}-backports main +deb-src ${MIRROR} ${RELEASE}-backports main EOF - fi - fi - fi + fi } # }}} @@ -478,8 +468,26 @@ timezone() { # helper function for fstab() {{{ createfstab(){ echo "Setting up /etc/fstab" + cat > /etc/fstab < /etc/fstab + local rootfs_mount_options=",errors=remount-ro" + case "${FILESYSTEM}" in + f2fs) + # errors=remount-ro is unsupported, see https://github.com/grml/grml-debootstrap/issues/163 + rootfs_mount_options="" + ;; + esac + + echo "/dev/disk/by-uuid/${TARGET_UUID} / auto defaults${rootfs_mount_options} 0 1" >> /etc/fstab else echo "Warning: couldn't identify target UUID for rootfs, your /etc/fstab might be incomplete." fi @@ -517,6 +525,28 @@ fstab() { } # }}} +# ensure we have according filesystem tools available {{{ +install_fs_tools() { + local pkg="" + + # note: this is supposed to be coming either via command lines' + # $_opt_filesystem or via createfstab() + case "${FILESYSTEM}" in + jfs) + pkg="jfsutils" + ;; + xfs) + pkg="xfsprogs" + ;; + esac + + if [ -n "${pkg:-}" ] && ! dpkg --list "${pkg}" 2>/dev/null | grep -q '^ii' ; then + echo "Filesystem package ${pkg} not present, installing now" + DEBIAN_FRONTEND=$DEBIAN_FRONTEND $APTINSTALL "${pkg}" + fi +} +# }}} + # set up hostname {{{ hostname() { if [ -n "$HOSTNAME" ] ; then @@ -585,6 +615,13 @@ efi_setup() { echo "Mounting $EFI on /boot/efi" mount "$EFI" /boot/efi || return 1 + # if efivarfs kernel module is loaded, but efivars isn't, + # then we need to mount efivarfs for efibootmgr usage + if ! ls /sys/firmware/efi/efivars/* &>/dev/null ; then + echo "Mounting efivarfs on /sys/firmware/efi/efivars" + mount -t efivarfs efivarfs /sys/firmware/efi/efivars + fi + echo "Invoking efibootmgr" efibootmgr || return 1 } @@ -624,19 +661,31 @@ grub_install() { for device in $SELECTED_PARTITIONS ; do GRUB="${device%%[0-9]}" echo "Installing grub on ${GRUB}:" - grub-install --no-floppy "$GRUB" + if ! grub-install --no-floppy "$GRUB" ; then + echo "Error: failed to execute 'grub-install --no-floppy $GRUB'." >&2 + exit 1 + fi + done rm -f /boot/grub/device.map else echo "Installing grub on ${GRUB}:" case "$RELEASE" in lenny|squeeze|wheezy) - grub-install --no-floppy "$(readlink -f "${GRUB}")" + local grub_dev + grub_dev="$(readlink -f "${GRUB}")" + if ! grub-install --no-floppy "${grub_dev}" ; then + echo "Error: failed to execute 'grub-install --no-floppy ${grub_dev}'." >&2 + exit 1 + fi rm -f /boot/grub/device.map ;; *) echo "(hd0) ${GRUB}" > /boot/grub/device.map - grub-install "(hd0)" + if ! grub-install "(hd0)" ; then + echo "Error: failed to execute 'grub-install (hd0)'." >&2 + exit 1 + fi rm /boot/grub/device.map ;; esac @@ -654,6 +703,11 @@ grub_install() { return 1 fi + if [ -n "${BOOT_APPEND}" ] ; then + echo "Adding BOOT_APPEND configuration ['${BOOT_APPEND}'] to /etc/default/grub." + sed -i "/GRUB_CMDLINE_LINUX_DEFAULT/ s#\"\$# ${BOOT_APPEND}\"#" /etc/default/grub + fi + mountpoint /boot/efi &>/dev/null && umount /boot/efi $UPDATEGRUB @@ -688,6 +742,8 @@ finalize() { [ -n "$POLICYRCD" ] && rm -f /usr/sbin/policy-rc.d + umount /sys/firmware/efi/efivars &>/dev/null || true + umount /sys >/dev/null 2>/dev/null || true umount /proc >/dev/null 2>/dev/null || true } @@ -712,7 +768,8 @@ trap signal_handler HUP INT QUIT TERM for i in chrootmirror grmlrepos backportrepos kernelimg_conf \ kernel packages extrapackages reconfigure hosts \ - default_locales timezone fstab hostname initrd grub_install passwords \ + default_locales timezone fstab install_fs_tools hostname \ + initrd grub_install passwords \ custom_scripts upgrade_system remove_apt_cache services \ remove_chrootmirror; do if stage $i ; then