From 7db3dfb3ef36ad9037005b1155f055922b5d4014 Mon Sep 17 00:00:00 2001 From: root Date: Tue, 15 Mar 2016 00:38:44 +0100 Subject: [PATCH] saving uncommitted changes in /etc prior to emerge run --- grub.d/10_linux | 21 +++++++++++---------- mtab | 1 + 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/grub.d/10_linux b/grub.d/10_linux index 94fe619..0b2914f 100755 --- a/grub.d/10_linux +++ b/grub.d/10_linux @@ -147,18 +147,19 @@ EOF } machine=`uname -m` -case "x$machine" in +globs="$GRUB_LINUX_KERNEL_GLOBS" +[ -z "$globs" ] && case "x$machine" in xi?86 | xx86_64) - list= - for i in /boot/vmlinuz-* /vmlinuz-* /boot/kernel-* ; do - if grub_file_is_not_garbage "$i" ; then list="$list $i" ; fi - done ;; - *) - list= - for i in /boot/vmlinuz-* /boot/vmlinux-* /vmlinuz-* /vmlinux-* /boot/kernel-* ; do - if grub_file_is_not_garbage "$i" ; then list="$list $i" ; fi - done ;; + globs="/boot/vmlinuz-* /vmlinuz-* /boot/kernel-*" + ;; + *) + globs="/boot/vmlinuz-* /boot/vmlinux-* /vmlinuz-* /vmlinux-* /boot/kernel-*" + ;; esac +list= +for i in ${globs} ; do + if grub_file_is_not_garbage "$i" ; then list="$list $i" ; fi +done case "$machine" in i?86) GENKERNEL_ARCH="x86" ;; diff --git a/mtab b/mtab index 0a52f8c..ee5f0bd 100644 --- a/mtab +++ b/mtab @@ -30,3 +30,4 @@ hugetlb /sys/fs/cgroup/hugetlb cgroup rw,nosuid,nodev,noexec,relatime,hugetlb 0 /dev/mapper/vg0-distfiles /usr/portage/distfiles ext4 rw,noatime 0 0 /dev/md1 /ubuntu ext3 ro,noatime,acl,user_xattr 0 0 binfmt_misc /proc/sys/fs/binfmt_misc binfmt_misc rw,nodev,noexec,nosuid 0 0 +/dev/md0 /boot ext3 rw,noatime 0 0 -- 2.39.5