From: Michael Prokop Date: Fri, 25 May 2018 08:50:49 +0000 (+0200) Subject: Merge remote-tracking branch 'origin/github/pr/49' X-Git-Tag: v0.31.3~4 X-Git-Url: https://git.grml.org/?p=grml-live.git;a=commitdiff_plain;h=5a07e4e2155664df5bcc21a1ffee138e079fc133;hp=3234a4f843e28da2085cc6b486c5031dbd9a5ab6 Merge remote-tracking branch 'origin/github/pr/49' --- diff --git a/debian/changelog b/debian/changelog index 5dfa863..4ccc2b5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,37 @@ +grml-live (0.31.2) unstable; urgency=medium + + * [3900f5d] GRMLBASE/98-clean-chroot: execute resolvconf workarounds + also for systemd. Thanks to András Korn + * Software related changes: + - [01295b2] drop apt-transport-https from GRMLBASE + - [e02aee4] replace iproute with iproute2 + * [1a823a1] Replace /etc/apt/grml.key with /etc/apt/trusted.gpg.d/grml- + archive-keyring.gpg. Thanks to Antoine Beaupré + for a related PR against grml-debian-keyring + * [56d4377] updatebase.GRMLBASE: no longer install aptitude + + -- Michael Prokop Fri, 27 Apr 2018 11:52:54 +0200 + +grml-live (0.31.1) unstable; urgency=medium + + * [81d68fd] Fix a bunch of typos + * Software related changes: + - [7c6e289] add x11vnc to GRML_FULL to properly support vnc boot + option. Thanks to luke2261git for the bugreport + - [38c0449] add ldnsutils to GRML_SMALL + * [d473b06] Generate empty /lib/udev/rules.d/69-lvm-metad.rules instead + of removing the file + * [66b3d05] GRMLBASE/52-mdadm: fix path for 64-md-raid-assembly.rules + * [3ddb937] GRMLBASE/91-update-pciids: test for new update-pciids + location in /usr/sbin + * [1b8b36a] GRMLBASE/93-update-usbids: test for new update-usbids + location in /usr/sbin + * [e23b03b] ssh service: set RuntimeDirectory=sshd to work with recent + openssh versions. Thanks to Darshaka Pathirana for + feedback + + -- Michael Prokop Tue, 20 Feb 2018 17:57:24 +0100 + grml-live (0.31.0) unstable; urgency=medium The "¡hola!, Secure Boot" release diff --git a/debian/grml-live.maintscript b/debian/grml-live.maintscript new file mode 100644 index 0000000..168dd5d --- /dev/null +++ b/debian/grml-live.maintscript @@ -0,0 +1 @@ +rm_conffile /etc/grml/fai/config/files/etc/apt/grml.key/GRMLBASE diff --git a/etc/grml/fai/config/files/etc/apt/grml.key/GRMLBASE b/etc/grml/fai/config/files/etc/apt/grml.key/GRMLBASE deleted file mode 100644 index 9733081..0000000 --- a/etc/grml/fai/config/files/etc/apt/grml.key/GRMLBASE +++ /dev/null @@ -1,122 +0,0 @@ ------BEGIN PGP PUBLIC KEY BLOCK----- -Version: GnuPG v1 - -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 -Hr1vfvwDEqTtPOvdZO3MrBGN -=ckLq ------END PGP PUBLIC KEY BLOCK----- diff --git a/etc/grml/fai/config/files/etc/apt/trusted.gpg.d/grml-archive-keyring.gpg/GRMLBASE b/etc/grml/fai/config/files/etc/apt/trusted.gpg.d/grml-archive-keyring.gpg/GRMLBASE new file mode 100644 index 0000000..2ff6d25 Binary files /dev/null and b/etc/grml/fai/config/files/etc/apt/trusted.gpg.d/grml-archive-keyring.gpg/GRMLBASE differ diff --git a/etc/grml/fai/config/hooks/updatebase.GRMLBASE b/etc/grml/fai/config/hooks/updatebase.GRMLBASE index 7255a2f..6588126 100755 --- a/etc/grml/fai/config/hooks/updatebase.GRMLBASE +++ b/etc/grml/fai/config/hooks/updatebase.GRMLBASE @@ -80,14 +80,5 @@ if [ -n "${WAYBACK_DATE:-}" ] ; then "${target}/etc/apt/sources.list.d/debian.list" fi -# install Grml gpg key: -$ROOTCMD apt-key add /etc/apt/grml.key - -if ! $ROOTCMD test -x /usr/bin/aptitude ; then - echo "aptitude binary is not available, installing to make sure further FAI actions continue to work" - $ROOTCMD apt-get update - $ROOTCMD apt-get -y install aptitude -fi - ## END OF FILE ################################################################# # vim:ft=sh expandtab ai tw=80 tabstop=4 shiftwidth=2 diff --git a/etc/grml/fai/config/package_config/GRMLBASE b/etc/grml/fai/config/package_config/GRMLBASE index 3806537..fe6f1ec 100644 --- a/etc/grml/fai/config/package_config/GRMLBASE +++ b/etc/grml/fai/config/package_config/GRMLBASE @@ -1,6 +1,5 @@ PACKAGES install -apt-transport-https busybox bzip2 console-data diff --git a/etc/grml/fai/config/package_config/GRML_FULL b/etc/grml/fai/config/package_config/GRML_FULL index cff02e7..13ba09b 100644 --- a/etc/grml/fai/config/package_config/GRML_FULL +++ b/etc/grml/fai/config/package_config/GRML_FULL @@ -159,7 +159,7 @@ ifupdown ipcalc iperf ipmitool -iproute +iproute2 iptraf-ng iptstate iputils-arping @@ -250,6 +250,7 @@ dirvish dump duplicity fsarchiver +restic # compressions for backup/restore lzop diff --git a/etc/grml/fai/config/package_config/GRML_SMALL b/etc/grml/fai/config/package_config/GRML_SMALL index a2f3458..ec96c57 100644 --- a/etc/grml/fai/config/package_config/GRML_SMALL +++ b/etc/grml/fai/config/package_config/GRML_SMALL @@ -34,7 +34,7 @@ htop ifenslave ifupdown imvirt -iproute +iproute2 iptstate iputils-ping isc-dhcp-client diff --git a/etc/grml/fai/config/scripts/GRMLBASE/98-clean-chroot b/etc/grml/fai/config/scripts/GRMLBASE/98-clean-chroot index 2e78bf7..88cba00 100755 --- a/etc/grml/fai/config/scripts/GRMLBASE/98-clean-chroot +++ b/etc/grml/fai/config/scripts/GRMLBASE/98-clean-chroot @@ -186,27 +186,23 @@ fi if ! [ -d $target/etc/resolvconf ] ; then echo "Warning: resolvconf not installed" else - if ! ifclass FILE_RC ; then - echo "Skipping resolvconf workaround because FILE_RC class not in use." - else - echo "Setting up resolvconf" - if [ ! -L $target/etc/resolvconf/run ] ; then # resolvconf without symlink?! - RESOLV_CONF=/etc/resolvconf/run - rm -rf ${target}/${RESOLV_CONF} - mkdir -p ${target}/${RESOLV_CONF} - - touch ${target}/${RESOLV_CONF}/enable-updates - mkdir ${target}/${RESOLV_CONF}/interface - - cat > ${target}/${RESOLV_CONF}/resolv.conf << EOF + echo "Setting up resolvconf" + if [ ! -L $target/etc/resolvconf/run ] ; then # resolvconf without symlink?! + RESOLV_CONF=/etc/resolvconf/run + rm -rf ${target}/${RESOLV_CONF} + mkdir -p ${target}/${RESOLV_CONF} + + touch ${target}/${RESOLV_CONF}/enable-updates + mkdir ${target}/${RESOLV_CONF}/interface + + cat > ${target}/${RESOLV_CONF}/resolv.conf << EOF # Dynamic resolv.conf(5) file for glibc resolver(3) generated by resolvconf(8) # DO NOT EDIT THIS FILE BY HAND -- YOUR CHANGES WILL BE OVERWRITTEN EOF - fi - rm -f ${target}/etc/resolvconf/resolv.conf.d/original - rm -f ${target}/etc/resolv.conf - $ROOTCMD ln -s /etc/resolvconf/run/resolv.conf /etc/resolv.conf fi + rm -f ${target}/etc/resolvconf/resolv.conf.d/original + rm -f ${target}/etc/resolv.conf + $ROOTCMD ln -s /etc/resolvconf/run/resolv.conf /etc/resolv.conf fi # make sure we don't leak any mdadm configurations