diff --git a/docs/grml-live.txt b/docs/grml-live.txt index e43ba7a58..6f47da28f 100644 --- a/docs/grml-live.txt +++ b/docs/grml-live.txt @@ -202,7 +202,7 @@ Specify name of the release. Specify the Debian suite you want to use for your live-system. If unset defaults to "testing". Supported values are: stable, testing, unstable (or their -corresponding release names like "stretch"). Please be aware that recent Debian +corresponding release names like "bookworm"). Please be aware that recent Debian suites might require a recent base.tgz (${GRML_FAI_CONFIG}/config/basefiles/$CLASSNAME.tar.gz) or a recent version of debootstrap. @@ -522,9 +522,9 @@ The easiest way to get a running grml-live setup is to just use Grml. Of course using grml-live on a plain, original Debian installation is supported as well. So there we go. -What we have: plain, original Debian stretch (9.x). +What we have: plain, original Debian bookworm (v12). -What we want: build a Grml ISO based on Debian/stretch for the amd64 architecture +What we want: build a Grml ISO based on Debian/bookworm for the amd64 architecture using grml-live. Instructions @@ -566,7 +566,7 @@ Instructions # CHROOT_INSTALL="/etc/grml/fai/chroot_install" ## adjust if necessary (defaults to ./grml/): ## OUTPUT="/srv/grml-live" - FAI_DEBOOTSTRAP="stretch http://ftp.debian.org/debian/" + FAI_DEBOOTSTRAP="bookworm http://deb.debian.org/debian/" # ARCH="amd64" CLASSES="GRMLBASE,GRML_FULL,AMD64" EOF @@ -689,7 +689,7 @@ FAI_DEBOOTSTRAP: [...] APT_PROXY="http://localhost:3142/" [...] - FAI_DEBOOTSTRAP="stretch http://localhost:3142/ftp.debian.org/debian stretch main contrib non-free" + FAI_DEBOOTSTRAP="bookworm http://localhost:3142/ftp.debian.org/debian bookworm main contrib non-free" Make sure apt-cacher-ng is running ('/etc/init.d/apt-cacher-ng restart'). That's it. All downloaded files will be cached in /var/cache/apt-cacher-ng then. @@ -719,7 +719,7 @@ How do I create a base tar.gz (I386.tar.gz or AMD64.tar.gz) First of all create the chroot using debootstrap (requires root): BASECHROOT='/tmp/basefile' # path where the chroot gets generated - SUITE='stretch' # using the current stable release should always work + SUITE='bookworm' # using the current stable release should always work debootstrap --exclude=info,tasksel,tasksel-data "$SUITE" "$BASECHROOT" http://ftp.debian.org/debian tar -C "$BASECHROOT" --exclude='var/cache/apt/archives/*.deb' -zcf "${SUITE}".tar.gz ./ diff --git a/etc/grml/fai/config/files/etc/apt/preferences.d/jessie-backports/DEBIAN_JESSIE b/etc/grml/fai/config/files/etc/apt/preferences.d/jessie-backports/DEBIAN_JESSIE deleted file mode 100644 index a877c25ac..000000000 --- a/etc/grml/fai/config/files/etc/apt/preferences.d/jessie-backports/DEBIAN_JESSIE +++ /dev/null @@ -1,9 +0,0 @@ -Explanation: this file was installed by grml-live to allow installation of systemd/udev (required for systemd-container) from backports -Package: systemd libsystemd0 libpam-systemd libapparmor1 ifupdown systemd-sysv udev libudev1 usb-modeswitch -Pin: release a=jessie-backports -Pin-Priority: 997 - -Explanation: this file was installed by grml-live to allow installation of linux-base (required for kernel packages) from backports -Package: linux-base firmware-misc-nonfree firmware-linux-nonfree firmware-linux -Pin: release a=jessie-backports -Pin-Priority: 997 diff --git a/etc/grml/fai/config/files/etc/apt/sources.list.d/debian.list/DEBIAN_BUSTER b/etc/grml/fai/config/files/etc/apt/sources.list.d/debian.list/DEBIAN_BUSTER deleted file mode 100644 index 3e16fd788..000000000 --- a/etc/grml/fai/config/files/etc/apt/sources.list.d/debian.list/DEBIAN_BUSTER +++ /dev/null @@ -1,7 +0,0 @@ -# official debian repository: - deb http://ftp.debian.org/debian/ buster main contrib non-free - deb-src http://ftp.debian.org/debian/ buster main contrib non-free - -# security updates: - deb http://security.debian.org/ buster/updates main contrib non-free - deb-src http://security.debian.org/ buster/updates main contrib non-free diff --git a/etc/grml/fai/config/files/etc/apt/sources.list.d/debian.list/DEBIAN_JESSIE b/etc/grml/fai/config/files/etc/apt/sources.list.d/debian.list/DEBIAN_JESSIE deleted file mode 100644 index 6e8cf12ed..000000000 --- a/etc/grml/fai/config/files/etc/apt/sources.list.d/debian.list/DEBIAN_JESSIE +++ /dev/null @@ -1,11 +0,0 @@ -# official debian repository: - deb http://ftp.debian.org/debian/ jessie main contrib non-free - deb-src http://ftp.debian.org/debian/ jessie main contrib non-free - -# security updates: - deb http://security.debian.org/ jessie/updates main contrib - deb-src http://security.debian.org/ jessie/updates main contrib - -# backports: - deb http://ftp.debian.org/debian/ jessie-backports main contrib non-free - deb-src http://ftp.debian.org/debian/ jessie-backports main contrib non-free diff --git a/etc/grml/fai/config/files/etc/apt/sources.list.d/debian.list/DEBIAN_LENNY b/etc/grml/fai/config/files/etc/apt/sources.list.d/debian.list/DEBIAN_LENNY deleted file mode 100644 index 9f9aaab81..000000000 --- a/etc/grml/fai/config/files/etc/apt/sources.list.d/debian.list/DEBIAN_LENNY +++ /dev/null @@ -1,7 +0,0 @@ -# official debian repository: - deb http://ftp.debian.org/debian/ lenny main contrib non-free - deb-src http://ftp.debian.org/debian/ lenny main contrib non-free - -# security updates: - deb http://security.debian.org/ lenny/updates main contrib - deb-src http://security.debian.org/ lenny/updates main contrib diff --git a/etc/grml/fai/config/files/etc/apt/sources.list.d/debian.list/DEBIAN_SQUEEZE b/etc/grml/fai/config/files/etc/apt/sources.list.d/debian.list/DEBIAN_SQUEEZE deleted file mode 100644 index 548e7edd6..000000000 --- a/etc/grml/fai/config/files/etc/apt/sources.list.d/debian.list/DEBIAN_SQUEEZE +++ /dev/null @@ -1,11 +0,0 @@ -# official debian repository: - deb http://ftp.debian.org/debian/ squeeze main contrib non-free - deb-src http://ftp.debian.org/debian/ squeeze main contrib non-free - -# security updates: - deb http://security.debian.org/ squeeze/updates main contrib - deb-src http://security.debian.org/ squeeze/updates main contrib - -# backports: - deb http://backports.debian.org/debian-backports squeeze-backports main contrib non-free - deb-src http://backports.debian.org/debian-backports squeeze-backports main contrib non-free diff --git a/etc/grml/fai/config/files/etc/apt/sources.list.d/debian.list/DEBIAN_STRETCH b/etc/grml/fai/config/files/etc/apt/sources.list.d/debian.list/DEBIAN_STRETCH deleted file mode 100644 index f27cc7fa5..000000000 --- a/etc/grml/fai/config/files/etc/apt/sources.list.d/debian.list/DEBIAN_STRETCH +++ /dev/null @@ -1,11 +0,0 @@ -# official debian repository: - deb http://ftp.debian.org/debian/ stretch main contrib non-free - deb-src http://ftp.debian.org/debian/ stretch main contrib non-free - -# security updates: - deb http://security.debian.org/ stretch/updates main contrib - deb-src http://security.debian.org/ stretch/updates main contrib - -# backports: - deb http://ftp.debian.org/debian/ stretch-backports main contrib non-free - deb-src http://ftp.debian.org/debian/ stretch-backports main contrib non-free diff --git a/etc/grml/fai/config/package_config/DEBIAN_SQUEEZE b/etc/grml/fai/config/package_config/DEBIAN_SQUEEZE deleted file mode 100644 index bf18dacc0..000000000 --- a/etc/grml/fai/config/package_config/DEBIAN_SQUEEZE +++ /dev/null @@ -1,5 +0,0 @@ -PACKAGES install - -# needed for linux-image-amd64-grml -linux-base/squeeze-backports -initramfs-tools/squeeze-backports diff --git a/etc/grml/fai/config/scripts/GRMLBASE/15-initsetup b/etc/grml/fai/config/scripts/GRMLBASE/15-initsetup index 459e51aca..efd9e64b4 100755 --- a/etc/grml/fai/config/scripts/GRMLBASE/15-initsetup +++ b/etc/grml/fai/config/scripts/GRMLBASE/15-initsetup @@ -16,20 +16,11 @@ systemd_setup() { echo "Enabling user '$USERNAME' for autologin" sed -i "s/\$USERNAME/$USERNAME/" "$target"/etc/systemd/system/getty@tty*.service.d/override.conf - case "$(cat "${target}"/etc/debian_version)" in - 8.*) - echo "Debian jessie detected. Enabling workaround for unknown systemctl preset-all/set-default exit failure." - $ROOTCMD systemctl preset-all || true - $ROOTCMD systemctl set-default grml-boot.target || true - ;; - *) - # workaround for #992847 to workaround /lib/systemd -> /usr/lib/systemd transition - $ROOTCMD rm -f /etc/systemd/system/syslog.service + # workaround for #992847 to workaround /lib/systemd -> /usr/lib/systemd transition + $ROOTCMD rm -f /etc/systemd/system/syslog.service - $ROOTCMD systemctl preset-all - $ROOTCMD systemctl set-default grml-boot.target - ;; - esac + $ROOTCMD systemctl preset-all + $ROOTCMD systemctl set-default grml-boot.target } file_rc_setup() { diff --git a/etc/grml/grml-live.conf b/etc/grml/grml-live.conf index 2c522053a..4fb693514 100644 --- a/etc/grml/grml-live.conf +++ b/etc/grml/grml-live.conf @@ -49,7 +49,7 @@ # Which Debian suite/release do you want to use? # Supported values are: stable, testing, unstable (or their corresponding release -# names like "stretch"). +# names like "bookworm"). # Unless it is set it defaults to "testing". # SUITE="unstable" @@ -66,7 +66,7 @@ # Which Debian suite and which mirror do you want to use for debootstrapping? # Usage: " " -# FAI_DEBOOTSTRAP="stretch http://ftp.debian.org/debian" +# FAI_DEBOOTSTRAP="bookworm http://ftp.debian.org/debian" # Do you want to use a local mirror (like NFS)? # If so specify the directory where debian/ is available: diff --git a/etc/zsh/completion.d/_grml-live b/etc/zsh/completion.d/_grml-live index cb43f596c..554f3e15e 100644 --- a/etc/zsh/completion.d/_grml-live +++ b/etc/zsh/completion.d/_grml-live @@ -47,7 +47,7 @@ _grmllive_suites() { #{{{ local -a suites suites=( - stable testing unstable jessie stretch buster sid + stable testing unstable bullseye bookworm sid ) _wanted list expl 'Debian suite' compadd ${expl} -- ${suites} }