From: Michael Prokop <mika@grml.org>
Date: Wed, 21 Aug 2019 13:25:04 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/github/pr/76'
X-Git-Tag: v0.34.2~4
X-Git-Url: http://git.grml.org/?p=grml-live.git;a=commitdiff_plain;h=be6f2299e24a58b94d07b35f2e07fbc60f9827c0;hp=09137840c2b705c3254c35621ac7af2c628d09d9

Merge remote-tracking branch 'origin/github/pr/76'
---

diff --git a/debian/changelog b/debian/changelog
index 4582089..b1f2af8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+grml-live (0.34.1) unstable; urgency=medium
+
+  * [8352df0] Provide workaround for FAI bug, leaving /run/udev behind
+    (see #928981)
+  * [3e832a3] Sources list setup for security: switch from testing/updates
+    to testing-security
+  * Software related changes:
+    - [ef82eb5] drop lilo from GRML_SMALL and GRML_FULL
+
+ -- Michael Prokop <mika@grml.org>  Thu, 11 Jul 2019 17:32:27 +0200
+
 grml-live (0.34.0) unstable; urgency=medium
 
   * [70a5830] Switch default mount point from /lib/live/mount/medium to
diff --git a/etc/grml/fai/config/files/etc/apt/sources.list.d/debian.list/DEBIAN_TESTING b/etc/grml/fai/config/files/etc/apt/sources.list.d/debian.list/DEBIAN_TESTING
index 0a51c94..a7dbe01 100644
--- a/etc/grml/fai/config/files/etc/apt/sources.list.d/debian.list/DEBIAN_TESTING
+++ b/etc/grml/fai/config/files/etc/apt/sources.list.d/debian.list/DEBIAN_TESTING
@@ -3,5 +3,5 @@
   deb-src http://ftp.debian.org/debian/ testing main contrib non-free
 
 # security updates:
-  deb     http://security.debian.org/ testing/updates main contrib
-  deb-src http://security.debian.org/ testing/updates main contrib
+  deb     http://security.debian.org/ testing-security main contrib
+  deb-src http://security.debian.org/ testing-security main contrib
diff --git a/etc/grml/fai/config/package_config/GRMLBASE b/etc/grml/fai/config/package_config/GRMLBASE
index d067b90..36e71c8 100644
--- a/etc/grml/fai/config/package_config/GRMLBASE
+++ b/etc/grml/fai/config/package_config/GRMLBASE
@@ -7,6 +7,7 @@ console-setup
 dbus
 deborphan
 dmidecode
+efibootmgr
 eject
 file
 gpm
diff --git a/etc/grml/fai/config/package_config/GRML_FULL b/etc/grml/fai/config/package_config/GRML_FULL
index a6d2a0e..8c626ae 100644
--- a/etc/grml/fai/config/package_config/GRML_FULL
+++ b/etc/grml/fai/config/package_config/GRML_FULL
@@ -74,7 +74,6 @@ smartmontools
 boot-info-script
 grub-pc-bin
 gparted
-lilo
 mbr
 partclone
 parted
diff --git a/etc/grml/fai/config/package_config/GRML_SMALL b/etc/grml/fai/config/package_config/GRML_SMALL
index 1b90f7e..15a2cef 100644
--- a/etc/grml/fai/config/package_config/GRML_SMALL
+++ b/etc/grml/fai/config/package_config/GRML_SMALL
@@ -43,7 +43,6 @@ kexec-tools
 ldnsutils
 lftp
 libnss-myhostname
-lilo
 links
 locales
 lrzsz
diff --git a/grml-live b/grml-live
index f4d1f2e..daa4da9 100755
--- a/grml-live
+++ b/grml-live
@@ -164,6 +164,7 @@ umount_all() {
    # make sure we don't leave any mounts - FAI doesn't remove them always
    umount $CHROOT_OUTPUT/proc/sys/fs/binfmt_misc 2>/dev/null || /bin/true
    umount $CHROOT_OUTPUT/proc 2>/dev/null || /bin/true
+   umount $CHROOT_OUTPUT/run/udev 2>/dev/null || /bin/true
    umount $CHROOT_OUTPUT/run  2>/dev/null || /bin/true
    umount $CHROOT_OUTPUT/sys  2>/dev/null || /bin/true
    umount $CHROOT_OUTPUT/dev/pts 2>/dev/null || /bin/true