]> Frank Brehm's Git Trees - config/lena/etc.git/commitdiff
committing changes in /etc after apt run
authorFrank Brehm <frank@brehm-online.com>
Mon, 14 Nov 2016 11:54:40 +0000 (12:54 +0100)
committerFrank Brehm <frank@brehm-online.com>
Mon, 14 Nov 2016 11:54:40 +0000 (12:54 +0100)
Package changes:
-coreutils 8.25-2 amd64
+coreutils 8.25-2+b1 amd64
-git 1:2.10.2-1 amd64
-git-arch 1:2.10.2-1 all
-git-email 1:2.10.2-1 all
-git-man 1:2.10.2-1 all
-git-svn 1:2.10.2-1 all
+git 1:2.10.2-2 amd64
+git-arch 1:2.10.2-2 all
+git-email 1:2.10.2-2 all
+git-man 1:2.10.2-2 all
+git-svn 1:2.10.2-2 all
-grub-common 2.02~beta3-1 amd64
-grub-pc 2.02~beta3-1 amd64
-grub-pc-bin 2.02~beta3-1 amd64
-grub2-common 2.02~beta3-1 amd64
+grub-common 2.02~beta3-3 amd64
+grub-pc 2.02~beta3-3 amd64
+grub-pc-bin 2.02~beta3-3 amd64
+grub2-common 2.02~beta3-3 amd64
-init 1.45 amd64
-init-system-helpers 1.45 all
+init 1.46 amd64
+init-system-helpers 1.46 all
-python-markupsafe 0.23-2+b2 amd64
+python-markupsafe 0.23-3 amd64
-sgml-base 1.28 all
+sgml-base 1.29 all

grub.d/10_linux
grub.d/20_linux_xen

index faa34fff65025a6d1482f556a23088092522a9f9..6945fcaf9ab49cc9e8f8db1296387b08408868ca 100755 (executable)
@@ -65,7 +65,7 @@ esac
 # and mounting btrfs requires user space scanning, so force UUID in this case.
 if [ "x${GRUB_DEVICE_UUID}" = "x" ] || [ "x${GRUB_DISABLE_LINUX_UUID}" = "xtrue" ] \
     || ! test -e "/dev/disk/by-uuid/${GRUB_DEVICE_UUID}" \
-    || test -e "${GRUB_DEVICE}" && uses_abstraction "${GRUB_DEVICE}" lvm; then
+    || ( test -e "${GRUB_DEVICE}" && uses_abstraction "${GRUB_DEVICE}" lvm ); then
   LINUX_ROOT_DEVICE=${GRUB_DEVICE}
 else
   LINUX_ROOT_DEVICE=UUID=${GRUB_DEVICE_UUID}
index 4caa0f5ee61c2a9f3560df4e81da85e6fe9d9bc4..2c05517952867927b01853e6241c692978550c4a 100755 (executable)
@@ -53,7 +53,7 @@ esac
 # and mounting btrfs requires user space scanning, so force UUID in this case.
 if [ "x${GRUB_DEVICE_UUID}" = "x" ] || [ "x${GRUB_DISABLE_LINUX_UUID}" = "xtrue" ] \
     || ! test -e "/dev/disk/by-uuid/${GRUB_DEVICE_UUID}" \
-    || test -e "${GRUB_DEVICE}" && uses_abstraction "${GRUB_DEVICE}" lvm; then
+    || ( test -e "${GRUB_DEVICE}" && uses_abstraction "${GRUB_DEVICE}" lvm ); then
   LINUX_ROOT_DEVICE=${GRUB_DEVICE}
 else
   LINUX_ROOT_DEVICE=UUID=${GRUB_DEVICE_UUID}