initial commit
This commit is contained in:
James Barnett
parent
7b39fb5d1b
commit
76c4151814
3 changed files with 4 additions and 300 deletions
1
Makefile
1
Makefile
|
|
@ -29,4 +29,3 @@ install:
|
||||||
@install -Dm644 LICENSE -t $(SHARE_DIR)/licenses/$(PKGNAME)
|
@install -Dm644 LICENSE -t $(SHARE_DIR)/licenses/$(PKGNAME)
|
||||||
@install -Dm644 man8/* -t $(SHARE_DIR)/man/man8
|
@install -Dm644 man8/* -t $(SHARE_DIR)/man/man8
|
||||||
@install -Dm644 README -t $(SHARE_DIR)/doc/$(PKGNAME)
|
@install -Dm644 README -t $(SHARE_DIR)/doc/$(PKGNAME)
|
||||||
@install -Dm755 grub.d/* -t $(ETC_DIR)/grub.d/
|
|
||||||
|
|
|
||||||
|
|
@ -1,282 +0,0 @@
|
||||||
#! /bin/sh
|
|
||||||
set -e
|
|
||||||
|
|
||||||
# grub-mkconfig helper script.
|
|
||||||
# Copyright (C) 2006,2007,2008,2009,2010 Free Software Foundation, Inc.
|
|
||||||
#
|
|
||||||
# GRUB is free software: you can redistribute it and/or modify
|
|
||||||
# it under the terms of the GNU General Public License as published by
|
|
||||||
# the Free Software Foundation, either version 3 of the License, or
|
|
||||||
# (at your option) any later version.
|
|
||||||
#
|
|
||||||
# GRUB is distributed in the hope that it will be useful,
|
|
||||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
# GNU General Public License for more details.
|
|
||||||
#
|
|
||||||
# You should have received a copy of the GNU General Public License
|
|
||||||
# along with GRUB. If not, see <http://www.gnu.org/licenses/>.
|
|
||||||
|
|
||||||
prefix="/usr"
|
|
||||||
exec_prefix="/usr"
|
|
||||||
datarootdir="/usr/share"
|
|
||||||
|
|
||||||
. "$pkgdatadir/grub-mkconfig_lib"
|
|
||||||
|
|
||||||
export TEXTDOMAIN=grub
|
|
||||||
export TEXTDOMAINDIR="${datarootdir}/locale"
|
|
||||||
|
|
||||||
CLASS="--class gnu-linux --class gnu --class os"
|
|
||||||
|
|
||||||
if [ "x${GRUB_DISTRIBUTOR}" = "x" ] ; then
|
|
||||||
OS=Linux
|
|
||||||
else
|
|
||||||
OS="${GRUB_DISTRIBUTOR} Linux"
|
|
||||||
CLASS="--class $(echo ${GRUB_DISTRIBUTOR} | tr 'A-Z' 'a-z' | cut -d' ' -f1|LC_ALL=C sed 's,[^[:alnum:]_],_,g') ${CLASS}"
|
|
||||||
fi
|
|
||||||
|
|
||||||
# loop-AES arranges things so that /dev/loop/X can be our root device, but
|
|
||||||
# the initrds that Linux uses don't like that.
|
|
||||||
case ${GRUB_DEVICE} in
|
|
||||||
/dev/loop/*|/dev/loop[0-9])
|
|
||||||
GRUB_DEVICE=`losetup ${GRUB_DEVICE} | sed -e "s/^[^(]*(\([^)]\+\)).*/\1/"`
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
|
|
||||||
# btrfs may reside on multiple devices. We cannot pass them as value of root= parameter
|
|
||||||
# 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
|
|
||||||
LINUX_ROOT_DEVICE=${GRUB_DEVICE}
|
|
||||||
else
|
|
||||||
LINUX_ROOT_DEVICE=UUID=${GRUB_DEVICE_UUID}
|
|
||||||
fi
|
|
||||||
|
|
||||||
case x"$GRUB_FS" in
|
|
||||||
xbtrfs)
|
|
||||||
rootsubvol="`make_system_path_relative_to_its_root /`"
|
|
||||||
rootsubvol="${rootsubvol#/}"
|
|
||||||
if [ "x${rootsubvol}" != x ]; then
|
|
||||||
GRUB_CMDLINE_LINUX="rootflags=subvol=${rootsubvol} ${GRUB_CMDLINE_LINUX}"
|
|
||||||
fi;;
|
|
||||||
xzfs)
|
|
||||||
rpool=`${grub_probe} --device ${GRUB_DEVICE} --target=fs_label 2>/dev/null || true`
|
|
||||||
bootfs="`make_system_path_relative_to_its_root / | sed -e "s,@$,,"`"
|
|
||||||
LINUX_ROOT_DEVICE="ZFS=${rpool}${bootfs}"
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
|
|
||||||
title_correction_code=
|
|
||||||
|
|
||||||
linux_entry ()
|
|
||||||
{
|
|
||||||
os="$1"
|
|
||||||
version="$2"
|
|
||||||
type="$3"
|
|
||||||
args="$4"
|
|
||||||
|
|
||||||
if [ -z "$boot_device_id" ]; then
|
|
||||||
boot_device_id="$(grub_get_device_id "${GRUB_DEVICE}")"
|
|
||||||
fi
|
|
||||||
if [ x$type != xsimple ] ; then
|
|
||||||
case $type in
|
|
||||||
recovery)
|
|
||||||
title="$(gettext_printf "%s, with Linux %s (recovery mode)" "${os}" "${version}")" ;;
|
|
||||||
fallback)
|
|
||||||
title="$(gettext_printf "%s, with Linux %s (fallback initramfs)" "${os}" "${version}")" ;;
|
|
||||||
*)
|
|
||||||
title="$(gettext_printf "%s, with Linux %s" "${os}" "${version}")" ;;
|
|
||||||
esac
|
|
||||||
if [ x"$title" = x"$GRUB_ACTUAL_DEFAULT" ] || [ x"Previous Linux versions>$title" = x"$GRUB_ACTUAL_DEFAULT" ]; then
|
|
||||||
replacement_title="$(echo "Advanced options for ${OS}" | sed 's,>,>>,g')>$(echo "$title" | sed 's,>,>>,g')"
|
|
||||||
quoted="$(echo "$GRUB_ACTUAL_DEFAULT" | grub_quote)"
|
|
||||||
title_correction_code="${title_correction_code}if [ \"x\$default\" = '$quoted' ]; then default='$(echo "$replacement_title" | grub_quote)'; fi;"
|
|
||||||
grub_warn "$(gettext_printf "Please don't use old title \`%s' for GRUB_DEFAULT, use \`%s' (for versions before 2.00) or \`%s' (for 2.00 or later)" "$GRUB_ACTUAL_DEFAULT" "$replacement_title" "gnulinux-advanced-$boot_device_id>gnulinux-$version-$type-$boot_device_id")"
|
|
||||||
fi
|
|
||||||
echo "menuentry '$(echo "$title" | grub_quote)' ${CLASS} \$menuentry_id_option 'gnulinux-$version-$type-$boot_device_id' {" | sed "s/^/$submenu_indentation/"
|
|
||||||
else
|
|
||||||
echo "menuentry '$(echo "$os" | grub_quote)' ${CLASS} \$menuentry_id_option 'gnulinux-simple-$boot_device_id' {" | sed "s/^/$submenu_indentation/"
|
|
||||||
fi
|
|
||||||
if [ x$type != xrecovery ] ; then
|
|
||||||
save_default_entry | grub_add_tab
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Use ELILO's generic "efifb" when it's known to be available.
|
|
||||||
# FIXME: We need an interface to select vesafb in case efifb can't be used.
|
|
||||||
if [ "x$GRUB_GFXPAYLOAD_LINUX" = x ]; then
|
|
||||||
echo " load_video" | sed "s/^/$submenu_indentation/"
|
|
||||||
if grep -qx "CONFIG_FB_EFI=y" "${config}" 2> /dev/null \
|
|
||||||
&& grep -qx "CONFIG_VT_HW_CONSOLE_BINDING=y" "${config}" 2> /dev/null; then
|
|
||||||
echo " set gfxpayload=keep" | sed "s/^/$submenu_indentation/"
|
|
||||||
fi
|
|
||||||
else
|
|
||||||
if [ "x$GRUB_GFXPAYLOAD_LINUX" != xtext ]; then
|
|
||||||
echo " load_video" | sed "s/^/$submenu_indentation/"
|
|
||||||
fi
|
|
||||||
echo " set gfxpayload=$GRUB_GFXPAYLOAD_LINUX" | sed "s/^/$submenu_indentation/"
|
|
||||||
fi
|
|
||||||
|
|
||||||
echo " insmod gzio" | sed "s/^/$submenu_indentation/"
|
|
||||||
|
|
||||||
if [ x$dirname = x/ ]; then
|
|
||||||
if [ -z "${prepare_root_cache}" ]; then
|
|
||||||
prepare_root_cache="$(prepare_grub_to_access_device ${GRUB_DEVICE} | grub_add_tab)"
|
|
||||||
fi
|
|
||||||
printf '%s\n' "${prepare_root_cache}" | sed "s/^/$submenu_indentation/"
|
|
||||||
else
|
|
||||||
if [ -z "${prepare_boot_cache}" ]; then
|
|
||||||
prepare_boot_cache="$(prepare_grub_to_access_device ${GRUB_DEVICE_BOOT} | grub_add_tab)"
|
|
||||||
fi
|
|
||||||
printf '%s\n' "${prepare_boot_cache}" | sed "s/^/$submenu_indentation/"
|
|
||||||
fi
|
|
||||||
message="$(gettext_printf "Loading Linux %s ..." ${version})"
|
|
||||||
sed "s/^/$submenu_indentation/" << EOF
|
|
||||||
echo '$(echo "$message" | grub_quote)'
|
|
||||||
linux ${rel_dirname}/${basename} root=${linux_root_device_thisversion} rw ${args}
|
|
||||||
EOF
|
|
||||||
if test -n "${initrd}" -o -n "${initrd_extra}" ; then
|
|
||||||
# TRANSLATORS: ramdisk isn't identifier. Should be translated.
|
|
||||||
message="$(gettext_printf "Loading initial ramdisk ...")"
|
|
||||||
printf ' %s\n' "echo '$(echo "$message" | grub_quote)'" | sed "s/^/$submenu_indentation/"
|
|
||||||
printf ' %s ' 'initrd' | sed "s/^/$submenu_indentation/"
|
|
||||||
for i in ${initrd_extra} ${initrd}; do
|
|
||||||
printf ' %s/%s' "${rel_dirname}" "${i}"
|
|
||||||
done
|
|
||||||
printf '\n'
|
|
||||||
fi
|
|
||||||
sed "s/^/$submenu_indentation/" << EOF
|
|
||||||
}
|
|
||||||
EOF
|
|
||||||
}
|
|
||||||
|
|
||||||
machine=`uname -m`
|
|
||||||
case "x$machine" in
|
|
||||||
xi?86 | xx86_64)
|
|
||||||
list=
|
|
||||||
for i in /boot/old/vmlinuz-*; do
|
|
||||||
if grub_file_is_not_garbage "$i" && [[ -h $i ]]; then list="$list $i" ; fi
|
|
||||||
done ;;
|
|
||||||
*)
|
|
||||||
list=
|
|
||||||
for i in /boot/old/vmlinuz-*; do
|
|
||||||
if grub_file_is_not_garbage "$i" && [[ -h $i ]]; then list="$list $i" ; fi
|
|
||||||
done ;;
|
|
||||||
esac
|
|
||||||
|
|
||||||
case "$machine" in
|
|
||||||
i?86) GENKERNEL_ARCH="x86" ;;
|
|
||||||
mips|mips64) GENKERNEL_ARCH="mips" ;;
|
|
||||||
mipsel|mips64el) GENKERNEL_ARCH="mipsel" ;;
|
|
||||||
arm*) GENKERNEL_ARCH="arm" ;;
|
|
||||||
*) GENKERNEL_ARCH="$machine" ;;
|
|
||||||
esac
|
|
||||||
|
|
||||||
prepare_boot_cache=
|
|
||||||
prepare_root_cache=
|
|
||||||
boot_device_id=
|
|
||||||
title_correction_code=
|
|
||||||
|
|
||||||
# Extra indentation to add to menu entries in a submenu. We're not in a submenu
|
|
||||||
# yet, so it's empty. In a submenu it will be equal to '\t' (one tab).
|
|
||||||
submenu_indentation=""
|
|
||||||
|
|
||||||
gettext_printf "Generating entries for older versions...\n" >&2
|
|
||||||
is_top_level=true
|
|
||||||
while [ "x$list" != "x" ] ; do
|
|
||||||
linux=`version_find_latest $list`
|
|
||||||
link=`readlink $linux`
|
|
||||||
basename=`basename $link`
|
|
||||||
dirname=`dirname $link`
|
|
||||||
rel_dirname=`make_system_path_relative_to_its_root $dirname`
|
|
||||||
version=`echo $basename | sed -e "s,vmlinuz-,,g"`
|
|
||||||
version_=`echo $(basename $linux) | sed -e "s,vmlinuz-,,g"`
|
|
||||||
gettext_printf "Found linux image: %s (%s)\n" "$link" "$version_" >&2
|
|
||||||
alt_version=`echo $version | sed -e "s,\.old$,,g"`
|
|
||||||
linux_root_device_thisversion="${LINUX_ROOT_DEVICE}"
|
|
||||||
|
|
||||||
initrd=
|
|
||||||
for i in "initrd.img-${version}" "initrd-${version}.img" "initrd-${version}.gz" \
|
|
||||||
"initrd-${version}" "initramfs-${version}.img" \
|
|
||||||
"initrd.img-${alt_version}" "initrd-${alt_version}.img" \
|
|
||||||
"initrd-${alt_version}" "initramfs-${alt_version}.img" \
|
|
||||||
"initramfs-genkernel-${version}" \
|
|
||||||
"initramfs-genkernel-${alt_version}" \
|
|
||||||
"initramfs-genkernel-${GENKERNEL_ARCH}-${version}" \
|
|
||||||
"initramfs-genkernel-${GENKERNEL_ARCH}-${alt_version}"; do
|
|
||||||
if test -e "${dirname}/${i}" ; then
|
|
||||||
initrd="$i"
|
|
||||||
break
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
initrd_extra=
|
|
||||||
for i in intel-ucode.img; do
|
|
||||||
if test -e "${dirname}/${i}" ; then
|
|
||||||
initrd_extra="${initrd_extra} ${i}"
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
|
|
||||||
config=
|
|
||||||
for i in "${dirname}/config-${version}" "${dirname}/config-${alt_version}" "/etc/kernels/kernel-config-${version}" ; do
|
|
||||||
if test -e "${i}" ; then
|
|
||||||
config="${i}"
|
|
||||||
break
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
|
|
||||||
initramfs=
|
|
||||||
if test -n "${config}" ; then
|
|
||||||
initramfs=`grep CONFIG_INITRAMFS_SOURCE= "${config}" | cut -f2 -d= | tr -d \"`
|
|
||||||
fi
|
|
||||||
|
|
||||||
if test -n "${initrd}" -o -n "${initrd_extra}" ; then
|
|
||||||
gettext_printf "Found initrd image(s) in %s:%s\n" "${dirname}" "${initrd_extra} ${initrd}" >&2
|
|
||||||
elif test -z "${initramfs}" ; then
|
|
||||||
# "UUID=" and "ZFS=" magic is parsed by initrd or initramfs. Since there's
|
|
||||||
# no initrd or builtin initramfs, it can't work here.
|
|
||||||
linux_root_device_thisversion=${GRUB_DEVICE}
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [ "x$is_top_level" = xtrue ] && [ "x${GRUB_DISABLE_SUBMENU}" != xy ]; then
|
|
||||||
linux_entry "${OS}" "${version}" simple \
|
|
||||||
"${GRUB_CMDLINE_LINUX} ${GRUB_CMDLINE_LINUX_DEFAULT}"
|
|
||||||
|
|
||||||
submenu_indentation="$grub_tab"
|
|
||||||
|
|
||||||
if [ -z "$boot_device_id" ]; then
|
|
||||||
boot_device_id="$(grub_get_device_id "${GRUB_DEVICE}")"
|
|
||||||
fi
|
|
||||||
# TRANSLATORS: %s is replaced with an OS name
|
|
||||||
echo "submenu '$(gettext_printf "Advanced options for %s" "${OS}" | grub_quote)' \$menuentry_id_option 'gnulinux-advanced-$boot_device_id' {"
|
|
||||||
is_top_level=false
|
|
||||||
fi
|
|
||||||
|
|
||||||
linux_entry "${OS}" "${version_}" advanced \
|
|
||||||
"${GRUB_CMDLINE_LINUX} ${GRUB_CMDLINE_LINUX_DEFAULT}"
|
|
||||||
|
|
||||||
if test -e "${dirname}/initramfs-linux-fallback.img" ; then
|
|
||||||
initrd="initramfs-linux-fallback.img"
|
|
||||||
|
|
||||||
if test -n "${initrd}" ; then
|
|
||||||
gettext_printf "Found fallback initrd image(s) in %s:%s\n" "${dirname}" "${initrd_extra} ${initrd}" >&2
|
|
||||||
fi
|
|
||||||
|
|
||||||
linux_entry "${OS}" "${version_}" fallback \
|
|
||||||
"${GRUB_CMDLINE_LINUX} ${GRUB_CMDLINE_LINUX_DEFAULT}"
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [ "x${GRUB_DISABLE_RECOVERY}" != "xtrue" ]; then
|
|
||||||
linux_entry "${OS}" "${version_}" recovery \
|
|
||||||
"single ${GRUB_CMDLINE_LINUX}"
|
|
||||||
fi
|
|
||||||
|
|
||||||
list=`echo $list | tr ' ' '\n' | fgrep -vx "$linux" | tr '\n' ' '`
|
|
||||||
done
|
|
||||||
|
|
||||||
# If at least one kernel was found, then we need to
|
|
||||||
# add a closing '}' for the submenu command.
|
|
||||||
if [ x"$is_top_level" != xtrue ]; then
|
|
||||||
echo '}'
|
|
||||||
fi
|
|
||||||
|
|
||||||
echo "$title_correction_code"
|
|
||||||
|
|
@ -58,7 +58,7 @@ set_defaults() {
|
||||||
PACMAN_PRE_DESCRIPTION="$pacman_cmd"
|
PACMAN_PRE_DESCRIPTION="$pacman_cmd"
|
||||||
PACMAN_POST_DESCRIPTION="$pacman_cmd"
|
PACMAN_POST_DESCRIPTION="$pacman_cmd"
|
||||||
PACMAN_CLEANUP_ALGORITHM="number"
|
PACMAN_CLEANUP_ALGORITHM="number"
|
||||||
PACMAN_KEEP_OLD_KERNELS="no"
|
PACMAN_LINK_MOCULES="no"
|
||||||
}
|
}
|
||||||
|
|
||||||
trap error_exit ERR
|
trap error_exit ERR
|
||||||
|
|
@ -78,29 +78,16 @@ for CONFIG in $SNAPPER_CONFIGS; do
|
||||||
|
|
||||||
if [[ "$pre_or_post" == "pre" ]]; then
|
if [[ "$pre_or_post" == "pre" ]]; then
|
||||||
|
|
||||||
if [[ "$PACMAN_KEEP_OLD_KERNELS" == "yes" && "$kernel_updated" == "yes" ]]; then
|
if [[ "$PACMAN_LINK_MODULES" == "yes" && "$kernel_updated" == "yes" ]]; then
|
||||||
x=$($snapper_cmd "$(truncate_description $PACMAN_PRE_DESCRIPTION)" --userdata important=yes)
|
x=$($snapper_cmd "$(truncate_description $PACMAN_PRE_DESCRIPTION)" --userdata important=yes)
|
||||||
else
|
else
|
||||||
x=$($snapper_cmd "$(truncate_description $PACMAN_PRE_DESCRIPTION)")
|
x=$($snapper_cmd "$(truncate_description $PACMAN_PRE_DESCRIPTION)")
|
||||||
fi
|
fi
|
||||||
printf "==> %s: $(echo $x | tee "$prefile")\n" "$CONFIG"
|
printf "==> %s: $(echo $x | tee "$prefile")\n" "$CONFIG"
|
||||||
if [[ "$PACMAN_KEEP_OLD_KERNELS" == "yes" && "$kernel_updated" == "yes" ]]; then
|
|
||||||
printf "==> Linking old kernels and modules...\n"
|
|
||||||
mkdir -p /boot/old
|
|
||||||
find /usr/lib/modules -xtype l -delete
|
|
||||||
find /boot/old -xtype l -delete
|
|
||||||
ln -sv /.snapshots/$x/snapshot/boot/vmlinuz-linux /boot/old/vmlinuz-linux-$(uname -r)
|
|
||||||
fi
|
|
||||||
elif [[ -f $prefile && "$pre_or_post" == "post" ]]; then
|
elif [[ -f $prefile && "$pre_or_post" == "post" ]]; then
|
||||||
if [[ "$PACMAN_KEEP_OLD_KERNELS" == "yes" && "$kernel_updated" == "yes" ]]; then
|
if [[ "$PACMAN_LINK_MODULES" == "yes" && "$kernel_updated" == "yes" ]]; then
|
||||||
printf "==> Linking old kernels and modules...\n"
|
printf "==> Linking old kernels and modules...\n"
|
||||||
x=$(<$prefile)
|
ln -sv /.snapshots/$(<$prefile)/snapshot/usr/lib/modules/$(uname -r) /usr/lib/modules/
|
||||||
ln -sv /.snapshots/$x/snapshot/usr/lib/modules/$(uname -r) /usr/lib/modules/
|
|
||||||
# kver=$(pacman -Q linux | awk '{print $2}')-ARCH
|
|
||||||
# mv /boot/vmlinuz-linux /boot/vmlinuz-linux-$kver
|
|
||||||
# mv /boot/initramfs-linux.img /boot/initramfs-linux-$kver.img
|
|
||||||
# mv /boot/initramfs-linux-fallback.img /boot/initramfs-linux-$kver-fallback.img
|
|
||||||
grub-mkconfig -o /boot/grub/grub.cfg
|
|
||||||
fi
|
fi
|
||||||
x=$($snapper_cmd "$(truncate_description $PACMAN_POST_DESCRIPTION)" --pre-number "$(< "$prefile")")
|
x=$($snapper_cmd "$(truncate_description $PACMAN_POST_DESCRIPTION)" --pre-number "$(< "$prefile")")
|
||||||
printf "==> %s: %s\n" "$CONFIG" "$x"
|
printf "==> %s: %s\n" "$CONFIG" "$x"
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue