diff --git a/usr/lib/initcpio/install/arch_encrypt b/usr/lib/initcpio/install/arch_encrypt index 363166b3a..d7b91a9e2 100644 --- a/usr/lib/initcpio/install/arch_encrypt +++ b/usr/lib/initcpio/install/arch_encrypt @@ -1,13 +1,13 @@ +#!/bin/bash # Created by Tobias Powalowski build () { - MODULES=" $(all_modules "/crypto/" | grep -v "aes.ko" ) cryptoloop" - BINARIES="/sbin/cryptsetup" - FILES="" - SCRIPT="arch_encrypt" + add_all_modules -f 'aes.ko' '/crypto/' 'cryptoloop' + add_binary "/sbin/cryptsetup" # fix licenses add_file "/usr/share/licenses/popt/LICENSE" + add_runscript } help () diff --git a/usr/lib/initcpio/install/arch_fb b/usr/lib/initcpio/install/arch_fb index 4fd0c6442..2a6ba351f 100644 --- a/usr/lib/initcpio/install/arch_fb +++ b/usr/lib/initcpio/install/arch_fb @@ -1,12 +1,12 @@ +#!/bin/bash # Created by Tobias Powalowski build () { - MODULES=" $(checked_modules "drivers/video/" | grep 'fb') $(checked_modules "drivers/char/agp") i915 radeon nouveau " - BINARIES="/sbin/v86d" - FILES="" - SCRIPT="arch_fb" + add_checked_modules 'drivers/video/' 'drivers/char/agp' 'i915' 'radeon' 'nouveau' + add_binary "/sbin/v86d" add_file "/usr/share/archboot/fb/etc/modprobe.d/uvesafb.conf" "/etc/modprobe.d/uvesafb.conf" + add_runscripts } help () diff --git a/usr/lib/initcpio/install/arch_filesystems b/usr/lib/initcpio/install/arch_filesystems index 612a00919..84af246e0 100644 --- a/usr/lib/initcpio/install/arch_filesystems +++ b/usr/lib/initcpio/install/arch_filesystems @@ -1,11 +1,17 @@ +#!/bin/bash # Created by Tobias Powalowski build () { - MODULES=" $(checked_modules '/kernel/fs') loop" - BINARIES="/sbin/mkswap /sbin/debugreiserfs /sbin/mkreiserfs /sbin/reiserfsck /sbin/reiserfstune /sbin/resize_reiserfs /sbin/badblocks /sbin/blkid /sbin/debugfs /sbin/dumpe2fs /sbin/e2fsck /sbin/e2image /sbin/e2undo /sbin/findfs /sbin/fsck /sbin/logsave /sbin/mkfs.ext2 /sbin/resize2fs /usr/bin/chattr /usr/bin/lsattr /usr/sbin/e2freefrag /usr/sbin/filefrag /usr/sbin/mkntfs /usr/sbin/ntfscp /usr/sbin/ntfsclone /usr/sbin/ntfslabel /usr/sbin/ntfsresize /usr/sbin/ntfsundelete /usr/bin/ntfscat /usr/bin/ntfscluster /usr/bin/ntfscmp /usr/bin/ntfsfix /usr/bin/ntfsinfo /usr/bin/ntfsls /sbin/jfs_debugfs /sbin/jfs_fsck /sbin/jfs_fscklog /sbin/jfs_logdump /sbin/jfs_mkfs /sbin/jfs_tune /sbin/mkfs.xfs /sbin/xfs_repair /usr/sbin/xfs_copy /usr/sbin/xfs_db /usr/sbin/xfs_growfs /usr/sbin/xfs_io /usr/sbin/xfs_logprint /usr/sbin/xfs_mdrestore /usr/sbin/xfs_quota /usr/sbin/xfs_rtcp /sbin/mkdosfs /sbin/dosfsck /sbin/dosfslabel /bin/lowntfs-3g /bin/ntfs-3g /sbin/mount.nfs /sbin/mount.cifs /usr/sbin/cifs.upcall /sbin/mkfs.reiserfs /sbin/fsck.reiserfs /sbin/fsck.ext2 /sbin/fsck.ext3 /sbin/fsck.ext4 /sbin/fsck.ext4dev /sbin/e2label /sbin/tune2fs /sbin/mkfs.ext3 /sbin/mkfs.ext4 /sbin/mke2fs /sbin/fsck.jfs /sbin/mkfs.jfs /sbin/mkfs.vfat /sbin/mkfs.msdos /sbin/fsck.msdos /sbin/fsck.vfat /sbin/mkfs.ntfs /sbin/mount.ntfs /sbin/mount.ntfs-3g /sbin/mount.lowntfs-3g /sbin/mount.nfs4 /sbin/umount.nfs /sbin/umount.nfs4 /sbin/wipefs /sbin/blockdev /usr/bin/btrfs /usr/bin/btrfs-convert /usr/bin/btrfs-debug-tree /usr/bin/btrfs-find-root /usr/bin/btrfs-image /usr/bin/btrfs-map-logical /usr/bin/btrfs-restore /usr/bin/btrfs-show /usr/bin/btrfs-vol /usr/bin/btrfs-zero-log /usr/bin/btrfsck /usr/bin/btrfsctl /usr/bin/btrfstune /usr/bin/mkfs.btrfs /sbin/mkfs.nilfs2 /sbin/mount.nilfs2 /sbin/nilfs_cleanerd /sbin/umount.nilfs2 /usr/bin/chcp /usr/bin/dumpseg /usr/bin/lscp /usr/bin/lssu /usr/bin/mkcp /usr/bin/rmcp /sbin/fsck.cramfs /sbin/fsck.minix /sbin/fsfreeze /sbin/fstrim /sbin/mkfs.bfs /sbin/mkfs.cramfs /sbin/mkfs.minix" - FILES="/usr/bin/compile_et /usr/bin/mk_cmds /sbin/fsck.xfs /usr/sbin/xfs_admin /usr/sbin/xfs_bmap /usr/sbin/xfs_check /usr/sbin/xfs_freeze /usr/sbin/xfs_info /usr/sbin/xfs_metadump /usr/sbin/xfs_mkfile /usr/sbin/xfs_ncheck" - SCRIPT="" + add_checked_modules '/kernel/fs' 'loop' + apps="/sbin/mkswap /sbin/debugreiserfs /sbin/mkreiserfs /sbin/reiserfsck /sbin/reiserfstune /sbin/resize_reiserfs /sbin/badblocks /sbin/blkid /sbin/debugfs /sbin/dumpe2fs /sbin/e2fsck /sbin/e2image /sbin/e2undo /sbin/findfs /sbin/fsck /sbin/logsave /sbin/mkfs.ext2 /sbin/resize2fs /usr/bin/chattr /usr/bin/lsattr /usr/sbin/e2freefrag /usr/sbin/filefrag /usr/sbin/mkntfs /usr/sbin/ntfscp /usr/sbin/ntfsclone /usr/sbin/ntfslabel /usr/sbin/ntfsresize /usr/sbin/ntfsundelete /usr/bin/ntfscat /usr/bin/ntfscluster /usr/bin/ntfscmp /usr/bin/ntfsfix /usr/bin/ntfsinfo /usr/bin/ntfsls /sbin/jfs_debugfs /sbin/jfs_fsck /sbin/jfs_fscklog /sbin/jfs_logdump /sbin/jfs_mkfs /sbin/jfs_tune /sbin/mkfs.xfs /sbin/xfs_repair /usr/sbin/xfs_copy /usr/sbin/xfs_db /usr/sbin/xfs_growfs /usr/sbin/xfs_io /usr/sbin/xfs_logprint /usr/sbin/xfs_mdrestore /usr/sbin/xfs_quota /usr/sbin/xfs_rtcp /sbin/mkdosfs /sbin/dosfsck /sbin/dosfslabel /bin/lowntfs-3g /bin/ntfs-3g /sbin/mount.nfs /sbin/mount.cifs /usr/sbin/cifs.upcall /sbin/mkfs.reiserfs /sbin/fsck.reiserfs /sbin/fsck.ext2 /sbin/fsck.ext3 /sbin/fsck.ext4 /sbin/fsck.ext4dev /sbin/e2label /sbin/tune2fs /sbin/mkfs.ext3 /sbin/mkfs.ext4 /sbin/mke2fs /sbin/fsck.jfs /sbin/mkfs.jfs /sbin/mkfs.vfat /sbin/mkfs.msdos /sbin/fsck.msdos /sbin/fsck.vfat /sbin/mkfs.ntfs /sbin/mount.ntfs /sbin/mount.ntfs-3g /sbin/mount.lowntfs-3g /sbin/mount.nfs4 /sbin/umount.nfs /sbin/umount.nfs4 /sbin/wipefs /sbin/blockdev /usr/bin/btrfs /usr/bin/btrfs-convert /usr/bin/btrfs-debug-tree /usr/bin/btrfs-find-root /usr/bin/btrfs-image /usr/bin/btrfs-map-logical /usr/bin/btrfs-restore /usr/bin/btrfs-show /usr/bin/btrfs-vol /usr/bin/btrfs-zero-log /usr/bin/btrfsck /usr/bin/btrfsctl /usr/bin/btrfstune /usr/bin/mkfs.btrfs /sbin/mkfs.nilfs2 /sbin/mount.nilfs2 /sbin/nilfs_cleanerd /sbin/umount.nilfs2 /usr/bin/chcp /usr/bin/dumpseg /usr/bin/lscp /usr/bin/lssu /usr/bin/mkcp /usr/bin/rmcp /sbin/fsck.cramfs /sbin/fsck.minix /sbin/fsfreeze /sbin/fstrim /sbin/mkfs.bfs /sbin/mkfs.cramfs /sbin/mkfs.minix" + for i in $apps; do + add_binary "$i" + done + appfiles="/usr/bin/compile_et /usr/bin/mk_cmds /sbin/fsck.xfs /usr/sbin/xfs_admin /usr/sbin/xfs_bmap /usr/sbin/xfs_check /usr/sbin/xfs_freeze /usr/sbin/xfs_info /usr/sbin/xfs_metadump /usr/sbin/xfs_mkfile /usr/sbin/xfs_ncheck" + for i in $appfiles do + add_file "$i" + done add_file "/usr/share/archboot/filesystem/etc/nilfs_cleanerd.conf" "/etc/nilfs_cleanerd.conf" # fix licenses add_file "/usr/share/licenses/e2fsprogs/MIT-LICENSE" diff --git a/usr/lib/initcpio/install/arch_fsarchiver b/usr/lib/initcpio/install/arch_fsarchiver index 295a45252..c13723581 100644 --- a/usr/lib/initcpio/install/arch_fsarchiver +++ b/usr/lib/initcpio/install/arch_fsarchiver @@ -1,11 +1,9 @@ +#!/bin/bash # Created by Tobias Powalowski build () { - MODULES="" - BINARIES="/usr/sbin/fsarchiver" - FILES="" - SCRIPT="" + add_binary "/usr/sbin/fsarchiver" } help () diff --git a/usr/lib/initcpio/install/arch_ftp_install b/usr/lib/initcpio/install/arch_ftp_install index 0b5a42c24..c2720ba9c 100644 --- a/usr/lib/initcpio/install/arch_ftp_install +++ b/usr/lib/initcpio/install/arch_ftp_install @@ -1,3 +1,4 @@ +#!/bin/bash # Created by Tobias Powalowski build () @@ -24,8 +25,6 @@ build () sleep 5 fi - SCRIPT= - BINARIES= # generate iso title name [ "${RUNPROGRAM}" = "mkisolinux" ] && echo "Arch_Linux_FTP $(uname -m)" >> ${ISONAME} } diff --git a/usr/lib/initcpio/install/arch_fw b/usr/lib/initcpio/install/arch_fw index 04813f380..28ed75ea3 100644 --- a/usr/lib/initcpio/install/arch_fw +++ b/usr/lib/initcpio/install/arch_fw @@ -1,16 +1,9 @@ +#!/bin/bash # Created by Tobias Powalowski build () { - MODULES=" $(checked_modules "/firewire/") " - - MODULES=$(echo ${MODULES}) #trim whitespace - if [ -n "${MODULES}" ]; then - MODULES="${MODULES} firewire-sbp2 sr_mod sd_mod" - fi - BINARIES="" - FILES="" - SCRIPT="" + add_checked_modules '/firewire/' 'firewire-sbp2' 'sr_mod' 'sd_mod' } help () diff --git a/usr/lib/initcpio/install/arch_grub2 b/usr/lib/initcpio/install/arch_grub2 index 58cd31b92..31e2b0813 100644 --- a/usr/lib/initcpio/install/arch_grub2 +++ b/usr/lib/initcpio/install/arch_grub2 @@ -1,10 +1,16 @@ +#!/bin/bash # Created by Tobias Powalowski build () { - BINARIES="/usr/bin/grub-editenv /usr/bin/grub-fstest /usr/bin/grub-menulst2cfg /usr/bin/grub-mkfont /usr/bin/grub-mkimage /usr/bin/grub-mklayout /usr/bin/grub-mkpasswd-pbkdf2 /usr/bin/grub-mkrelpath /usr/bin/grub-mount /usr/bin/grub-ntldr-img /usr/bin/grub-script-check /usr/sbin/grub-bios-setup /usr/sbin/grub-ofpathname /usr/sbin/grub-probe" - FILES="/usr/bin/grub-kbdcomp /usr/bin/grub-mkrescue /usr/bin/grub-mkstandalone /usr/sbin/grub-install /usr/sbin/grub-mkconfig /usr/sbin/grub-mknetdir /usr/sbin/grub-reboot /usr/sbin/grub-set-default" - + apps="/usr/bin/grub-editenv /usr/bin/grub-fstest /usr/bin/grub-menulst2cfg /usr/bin/grub-mkfont /usr/bin/grub-mkimage /usr/bin/grub-mklayout /usr/bin/grub-mkpasswd-pbkdf2 /usr/bin/grub-mkrelpath /usr/bin/grub-mount /usr/bin/grub-ntldr-img /usr/bin/grub-script-check /usr/sbin/grub-bios-setup /usr/sbin/grub-ofpathname /usr/sbin/grub-probe" + for i in $apps; do + add_binary "$i" + done + appfiles="/usr/bin/grub-kbdcomp /usr/bin/grub-mkrescue /usr/bin/grub-mkstandalone /usr/sbin/grub-install /usr/sbin/grub-mkconfig /usr/sbin/grub-mknetdir /usr/sbin/grub-reboot /usr/sbin/grub-set-default" + for i in $appfiles do + add_file "$i" + done ## add grub2 config file add_file "/boot/grub/grub.cfg" @@ -16,14 +22,6 @@ build () add_file "$i" done - ## Use grub2-common package grub-mkconfig helper scripts - not Archboot specific ones - # - # add_file "/usr/share/archboot/grub2/etc/default/grub" "/etc/default/grub" - # - # for i in $(find /usr/share/archboot/grub2/etc/grub.d/* ! -type d); do - # add_file "$i" "/etc/grub.d/$(basename $i)" - # done - for i in $(find /usr/lib/grub/x86_64-efi ! -type d); do add_file "$i" done diff --git a/usr/lib/initcpio/install/arch_hwdetect b/usr/lib/initcpio/install/arch_hwdetect index f489074f2..e464b93ea 100644 --- a/usr/lib/initcpio/install/arch_hwdetect +++ b/usr/lib/initcpio/install/arch_hwdetect @@ -1,11 +1,9 @@ +#!/bin/bash # Created by Tobias Powalowski build () { - MODULES="" - BINARIES="" - FILES="/sbin/hwdetect" - SCRIPT="" + add_file "/sbin/hwdetect" } help () diff --git a/usr/share/archboot/grub2/etc/default/grub b/usr/share/archboot/grub2/etc/default/grub deleted file mode 100644 index fdd1fc381..000000000 --- a/usr/share/archboot/grub2/etc/default/grub +++ /dev/null @@ -1,47 +0,0 @@ -GRUB_DEFAULT=0 -GRUB_TIMEOUT=5 -GRUB_DISTRIBUTOR="Arch" -GRUB_CMDLINE_LINUX_DEFAULT="quiet" -GRUB_CMDLINE_LINUX="" - -# Preload both GPT and MBR modules so that they are not missed -GRUB_PRELOAD_MODULES="part_gpt part_msdos" - -# Uncomment to enable Hidden Menu, and optionally hide the timeout count -#GRUB_HIDDEN_TIMEOUT=5 -#GRUB_HIDDEN_TIMEOUT_QUIET=true - -# Uncomment to use basic console -GRUB_TERMINAL_INPUT=console - -# Uncomment to disable graphical terminal -#GRUB_TERMINAL_OUTPUT=console - -# The resolution used on graphical terminal -# note that you can use only modes which your graphic card supports via VBE -# you can see them in real GRUB with the command `vbeinfo' -GRUB_GFXMODE=auto - -# Uncomment to allow the kernel use the same resolution used by grub -GRUB_GFXPAYLOAD_LINUX=keep - -# Uncomment if you want GRUB to pass to the Linux kernel the old parameter -# format "root=/dev/xxx" instead of "root=/dev/disk/by-uuid/xxx" -#GRUB_DISABLE_LINUX_UUID=true - -# Uncomment to disable generation of recovery mode menu entries -GRUB_DISABLE_RECOVERY=true - -# Uncomment and set to the desired menu colors. Used by normal and wallpaper -# modes only. Entries specified as foreground/background. -#GRUB_COLOR_NORMAL="light-blue/black" -#GRUB_COLOR_HIGHLIGHT="light-cyan/blue" - -# Uncomment one of them for the gfx desired, a image background or a gfxtheme -#GRUB_BACKGROUND="/path/to/wallpaper" -#GRUB_THEME="/path/to/gfxtheme" - -# Uncomment to get a beep at GRUB start -#GRUB_INIT_TUNE="480 440 1" - -#GRUB_SAVEDEFAULT="true" diff --git a/usr/share/archboot/grub2/etc/grub.d/00_header b/usr/share/archboot/grub2/etc/grub.d/00_header deleted file mode 100755 index 91434e372..000000000 --- a/usr/share/archboot/grub2/etc/grub.d/00_header +++ /dev/null @@ -1,326 +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 . - -transform="s&^&&" - -prefix="/usr" -exec_prefix="${prefix}" -datarootdir="/usr/share" -grub_lang=`echo $LANG | cut -d . -f 1` - -export TEXTDOMAIN=grub -export TEXTDOMAINDIR="${datarootdir}/locale" - -. "${datarootdir}/grub/grub-mkconfig_lib" - -# Do this as early as possible, since other commands might depend on it. -# (e.g. the `loadfont' command might need lvm or raid modules) -for i in ${GRUB_PRELOAD_MODULES} ; do - echo "insmod $i" -done - -if [ "x${GRUB_DEFAULT}" = "x" ] ; then GRUB_DEFAULT=0 ; fi -if [ "x${GRUB_DEFAULT}" = "xsaved" ] ; then GRUB_DEFAULT='${saved_entry}' ; fi -if [ "x${GRUB_TIMEOUT}" = "x" ] ; then GRUB_TIMEOUT=5 ; fi -if [ "x${GRUB_GFXMODE}" = "x" ] ; then GRUB_GFXMODE=auto ; fi - -if [ "x${GRUB_DEFAULT_BUTTON}" = "x" ] ; then GRUB_DEFAULT_BUTTON="$GRUB_DEFAULT" ; fi -if [ "x${GRUB_DEFAULT_BUTTON}" = "xsaved" ] ; then GRUB_DEFAULT_BUTTON='${saved_entry}' ; fi -if [ "x${GRUB_TIMEOUT_BUTTON}" = "x" ] ; then GRUB_TIMEOUT_BUTTON="$GRUB_TIMEOUT" ; fi - -cat << EOF -if [ -s \$prefix/grubenv ]; then - load_env -fi -EOF -if [ "x$GRUB_BUTTON_CMOS_ADDRESS" != "x" ]; then - cat < /dev/null ; then - font_path="${path}" - else - continue - fi - break 2 - done - done - if [ -n "${font_path}" ] ; then - cat << EOF -if [ x\$feature_default_font_path = xy ] ; then - font=unicode -else -EOF - # Make the font accessible - prepare_grub_to_access_device `${grub_probe} --target=device "${font_path}"` - cat << EOF - font="`make_system_path_relative_to_its_root "${font_path}"`" -fi - -if loadfont \$font ; then -EOF - else - cat << EOF -if loadfont unicode ; then -EOF - fi - fi - - cat << EOF - set gfxmode=${GRUB_GFXMODE} - load_video - insmod gfxterm -EOF - -# Gettext variables and module -if [ "x${LANG}" != "xC" ] ; then - cat << EOF - set locale_dir=\$prefix/locale - set lang=${grub_lang} - insmod gettext -EOF -fi - -cat <&2 - - prepare_grub_to_access_device `${grub_probe} --target=device "$GRUB_THEME"` - cat << EOF -insmod gfxmenu -EOF - themedir="`dirname "$GRUB_THEME"`" - for x in "$themedir"/*.pf2 "$themedir"/f/*.pf2; do - if [ -f "$x" ]; then - cat << EOF -loadfont (\$root)`make_system_path_relative_to_its_root $x` -EOF - fi - done - if [ x"`echo "$themedir"/*.jpg`" != x"$themedir/*.jpg" ] || [ x"`echo "$themedir"/*.jpeg`" != x"$themedir/*.jpeg" ]; then - cat << EOF -insmod jpeg -EOF - fi - if [ x"`echo "$themedir"/*.png`" != x"$themedir/*.png" ]; then - cat << EOF -insmod png -EOF - fi - if [ x"`echo "$themedir"/*.tga`" != x"$themedir/*.tga" ]; then - cat << EOF -insmod tga -EOF - fi - - cat << EOF -set theme=(\$root)`make_system_path_relative_to_its_root $GRUB_THEME` -export theme -EOF - elif [ "x$GRUB_BACKGROUND" != x ] && [ -f "$GRUB_BACKGROUND" ] \ - && is_path_readable_by_grub "$GRUB_BACKGROUND"; then - gettext_printf "Found background: %s\n" "$GRUB_BACKGROUND" >&2 - case "$GRUB_BACKGROUND" in - *.png) reader=png ;; - *.tga) reader=tga ;; - *.jpg|*.jpeg) reader=jpeg ;; - *) gettext "Unsupported image format" >&2; echo >&2; exit 1 ;; - esac - prepare_grub_to_access_device `${grub_probe} --target=device "$GRUB_BACKGROUND"` - cat << EOF -insmod $reader -background_image -m stretch `make_system_path_relative_to_its_root "$GRUB_BACKGROUND"` -EOF - fi -fi - -make_timeout () -{ - if [ "x${1}" != "x" ] ; then - if [ "x${GRUB_HIDDEN_TIMEOUT_QUIET}" = "xtrue" ] ; then - verbose= - else - verbose=" --verbose" - fi - cat << EOF -if sleep$verbose --interruptible ${1} ; then - set timeout=${2} -fi -EOF - else - cat << EOF -set timeout=${2} -EOF - fi -} - -if [ "x$GRUB_BUTTON_CMOS_ADDRESS" != "x" ]; then - cat <. - -prefix="/usr" -exec_prefix="${prefix}" -datarootdir="/usr/share" - -. "${datarootdir}/grub/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=GNU/Linux -else - OS="${GRUB_DISTRIBUTOR} GNU/Linux" - CLASS="--class $(echo ${GRUB_DISTRIBUTOR} | tr 'A-Z' 'a-z' | cut -d' ' -f1) ${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 - -if [ "x${GRUB_DEVICE_UUID}" = "x" ] || [ "x${GRUB_DISABLE_LINUX_UUID}" = "xtrue" ] \ - || ! test -e "/dev/disk/by-uuid/${GRUB_DEVICE_UUID}" \ - || uses_abstraction "${GRUB_DEVICE}" lvm; then - LINUX_ROOT_DEVICE=${GRUB_DEVICE} -else - LINUX_ROOT_DEVICE=UUID=${GRUB_DEVICE_UUID} -fi - -GRUBFS="`${grub_probe} --device ${GRUB_DEVICE} --target=fs 2>/dev/null || true`" - -if [ x"$GRUBFS" = x ]; then - GRUBFS="$(stat -f --printf=%T / || true)" -fi - -case x"$GRUBFS" 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 ] && [ x$type != xfallback ] ; then - save_default_entry | sed -e "s/^/\t/" - 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} | sed -e "s/^/\t/")" - 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} | sed -e "s/^/\t/")" - 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 '$message' - linux ${rel_dirname}/${basename} root=${linux_root_device_thisversion} ro ${args} -EOF - if test -n "${initrd}" ; then - # TRANSLATORS: ramdisk isn't identifier. Should be translated. - message="$(gettext_printf "Loading initial ramdisk ...")" - sed "s/^/$submenu_indentation/" << EOF - echo '$message' - initrd ${rel_dirname}/${initrd} -EOF - fi - sed "s/^/$submenu_indentation/" << EOF -} -EOF -} - -machine=`uname -m` -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 echo -n "$i " ; fi - done` ;; - *) - list=`for i in /boot/vmlinuz-* /boot/vmlinux-* /vmlinuz-* /vmlinux-* /boot/kernel-* ; do - if grub_file_is_not_garbage "$i" ; then echo -n "$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="" - -is_first_entry=true -while [ "x$list" != "x" ] ; do - linux=`version_find_latest $list` - gettext_printf "Found linux image: %s\n" "$linux" >&2 - basename=`basename $linux` - dirname=`dirname $linux` - rel_dirname=`make_system_path_relative_to_its_root $dirname` - version=`echo $basename | sed -e "s,^[^0-9]*-,,g"` - alt_version=`echo $version | sed -e "s,\.old$,,g"` - linux_root_device_thisversion="${LINUX_ROOT_DEVICE}" - - if test -e "/etc/arch-release" ; then - if echo "${basename}" | grep -q 'vmlinuz-linux' ; then - version="`echo "${basename}" | sed -e 's,vmlinuz-linux,,g'`" - - if [ "x${version}" = "x" ] ; then - version="core repo kernel" - else - version="`echo "${version}" | sed -e 's,-,,g'`" - version="${version} kernel" - fi - fi - fi - - initrd= - initrd_arch="`echo "${basename}" | sed -e 's,vmlinuz,initramfs,g'`" - - 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}" \ - "${initrd_arch}.img" ; do - if test -e "${dirname}/${i}" ; then - initrd="$i" - break - 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}" ; then - gettext_printf "Found initrd image: %s\n" "${dirname}/${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 test -e "/etc/arch-release" ; then - is_first_entry="false" - - linux_entry "${OS}" "${version}" true \ - "${GRUB_CMDLINE_LINUX} ${GRUB_CMDLINE_LINUX_DEFAULT}" - - for i in "${initrd_arch}-fallback.img" "initramfs-${version}-fallback.img" ; do - if test -e "${dirname}/${i}" ; then - initrd="${i}" - linux_entry "${OS}" "${version}" fallback \ - "${GRUB_CMDLINE_LINUX} ${GRUB_CMDLINE_LINUX_DEFAULT}" - break - fi - done - fi - - if [ "x$is_first_entry" = xtrue ]; then - linux_entry "${OS}" "${version}" simple \ - "${GRUB_CMDLINE_LINUX} ${GRUB_CMDLINE_LINUX_DEFAULT}" - - submenu_indentation="\t" - - 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' {" - fi - - if ! test -e "/etc/arch-release" ; then - linux_entry "${OS}" "${version}" advanced \ - "${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' | grep -vx $linux | tr '\n' ' '` - is_first_entry=false -done - -# If at least one kernel was found, then we need to -# add a closing '}' for the submenu command. -if ! test -e "/etc/arch-release" ; then -if [ x"$is_first_entry" != xtrue ]; then - echo '}' -fi -fi - -echo "$title_correction_code" diff --git a/usr/share/archboot/grub2/etc/grub.d/20_linux_xen b/usr/share/archboot/grub2/etc/grub.d/20_linux_xen deleted file mode 100755 index 043d34315..000000000 --- a/usr/share/archboot/grub2/etc/grub.d/20_linux_xen +++ /dev/null @@ -1,250 +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 . - -prefix="/usr" -exec_prefix="${prefix}" -datarootdir="/usr/share" - -. "${datarootdir}/grub/grub-mkconfig_lib" - -export TEXTDOMAIN=grub -export TEXTDOMAINDIR="${datarootdir}/locale" - -CLASS="--class gnu-linux --class gnu --class os --class xen" - -if [ "x${GRUB_DISTRIBUTOR}" = "x" ] ; then - OS=GNU/Linux -else - OS="${GRUB_DISTRIBUTOR} GNU/Linux" - CLASS="--class $(echo ${GRUB_DISTRIBUTOR} | tr 'A-Z' 'a-z' | cut -d' ' -f1) ${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 - -if [ "x${GRUB_DEVICE_UUID}" = "x" ] || [ "x${GRUB_DISABLE_LINUX_UUID}" = "xtrue" ] \ - || ! test -e "/dev/disk/by-uuid/${GRUB_DEVICE_UUID}" \ - || uses_abstraction "${GRUB_DEVICE}" lvm; then - LINUX_ROOT_DEVICE=${GRUB_DEVICE} -else - LINUX_ROOT_DEVICE=UUID=${GRUB_DEVICE_UUID} -fi - -# Allow overriding GRUB_CMDLINE_LINUX and GRUB_CMDLINE_LINUX_DEFAULT. -if [ "${GRUB_CMDLINE_LINUX_XEN_REPLACE}" ]; then - GRUB_CMDLINE_LINUX="${GRUB_CMDLINE_LINUX_XEN_REPLACE}" -fi -if [ "${GRUB_CMDLINE_LINUX_XEN_REPLACE_DEFAULT}" ]; then - GRUB_CMDLINE_LINUX_DEFAULT="${GRUB_CMDLINE_LINUX_XEN_REPLACE_DEFAULT}" -fi - -GRUBFS="`${grub_probe} --device ${GRUB_DEVICE} --target=fs 2>/dev/null || true`" - -if [ x"$GRUBFS" = x ]; then - GRUBFS="$(stat -f --printf=%T /)" -fi - -case x"$GRUBFS" 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" - xen_version="$3" - type="$4" - args="$5" - xen_args="$6" - if [ -z "$boot_device_id" ]; then - boot_device_id="$(grub_get_device_id "${GRUB_DEVICE}")" - fi - if [ x$type != xsimple ] ; then - if [ x$type = xrecovery ] ; then - title="$(gettext_printf "%s, with Xen %s and Linux %s (recovery mode)" "${os}" "${xen_version}" "${version}")" - else - title="$(gettext_printf "%s, with Xen %s and Linux %s" "${os}" "${xen_version}" "${version}")" - fi - replacement_title="$(echo "Advanced options for ${OS}" | sed 's,>,>>,g')>$(echo "$title" | sed 's,>,>>,g')" - if [ x"Xen ${xen_version}>$title" = x"$GRUB_ACTUAL_DEFAULT" ]; then - 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 'xen-gnulinux-$version-$type-$boot_device_id' {" | sed "s/^/$submenu_indentation/" - else - title="$(gettext_printf "%s, with Xen hypervisor" "${os}")" - echo "menuentry '$(echo "$title" | grub_quote)' ${CLASS} \$menuentry_id_option 'xen-gnulinux-simple-$boot_device_id' {" | sed "s/^/$submenu_indentation/" - fi - if [ x$type != xrecovery ] ; then - save_default_entry | sed -e "s/^/\t/" | sed "s/^/$submenu_indentation/" - fi - - if [ -z "${prepare_boot_cache}" ]; then - prepare_boot_cache="$(prepare_grub_to_access_device ${GRUB_DEVICE_BOOT} | sed -e "s/^/\t/")" - fi - printf '%s\n' "${prepare_boot_cache}" | sed "s/^/$submenu_indentation/" - xmessage="$(gettext_printf "Loading Xen %s ..." ${xen_version})" - lmessage="$(gettext_printf "Loading Linux %s ..." ${version})" - sed "s/^/$submenu_indentation/" << EOF - echo '$xmessage' - multiboot ${rel_xen_dirname}/${xen_basename} placeholder ${xen_args} - echo '$lmessage' - module ${rel_dirname}/${basename} placeholder root=${linux_root_device_thisversion} ro ${args} -EOF - if test -n "${initrd}" ; then - # TRANSLATORS: ramdisk isn't identifier. Should be translated. - message="$(gettext_printf "Loading initial ramdisk ...")" - sed "s/^/$submenu_indentation/" << EOF - echo '$message' - module ${rel_dirname}/${initrd} -EOF - fi - sed "s/^/$submenu_indentation/" << EOF -} -EOF -} - -linux_list=`for i in /boot/vmlinu[xz]-* /vmlinu[xz]-* /boot/kernel-*; do - if grub_file_is_not_garbage "$i"; then - basename=$(basename $i) - version=$(echo $basename | sed -e "s,^[^0-9]*-,,g") - dirname=$(dirname $i) - config= - for j in "${dirname}/config-${version}" "${dirname}/config-${alt_version}" "/etc/kernels/kernel-config-${version}" ; do - if test -e "${j}" ; then - config="${j}" - break - fi - done - if (grep -qx "CONFIG_XEN_DOM0=y" "${config}" 2> /dev/null || grep -qx "CONFIG_XEN_PRIVILEGED_GUEST=y" "${config}" 2> /dev/null); then echo -n "$i " ; fi - fi - done` -if [ "x${linux_list}" = "x" ] ; then - exit 0 -fi -xen_list=`for i in /boot/xen*; do - if grub_file_is_not_garbage "$i" ; then echo -n "$i " ; fi - done` -prepare_boot_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="" - -is_first_entry=true - -while [ "x${xen_list}" != "x" ] ; do - list="${linux_list}" - current_xen=`version_find_latest $xen_list` - xen_basename=`basename ${current_xen}` - xen_dirname=`dirname ${current_xen}` - rel_xen_dirname=`make_system_path_relative_to_its_root $xen_dirname` - xen_version=`echo $xen_basename | sed -e "s,.gz$,,g;s,^xen-,,g"` - if [ -z "$boot_device_id" ]; then - boot_device_id="$(grub_get_device_id "${GRUB_DEVICE}")" - fi - if [ "x$is_first_entry" != xtrue ]; then - echo " submenu '$(gettext_printf "Xen hypervisor, version %s" "${xen_version}" | grub_quote)' \$menuentry_id_option 'xen-hypervisor-$xen_version-$boot_device_id' {" - fi - while [ "x$list" != "x" ] ; do - linux=`version_find_latest $list` - gettext_printf "Found linux image: %s\n" "$linux" >&2 - basename=`basename $linux` - dirname=`dirname $linux` - rel_dirname=`make_system_path_relative_to_its_root $dirname` - version=`echo $basename | sed -e "s,^[^0-9]*-,,g"` - 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}" "initrd.img-${alt_version}" \ - "initrd-${alt_version}.img" "initrd-${alt_version}" \ - "initramfs-genkernel-${version}" \ - "initramfs-genkernel-${alt_version}" ; do - if test -e "${dirname}/${i}" ; then - initrd="$i" - break - fi - done - if test -n "${initrd}" ; then - gettext_printf "Found initrd image: %s\n" "${dirname}/${initrd}" >&2 - else - # "UUID=" magic is parsed by initrds. Since there's no initrd, it can't work here. - linux_root_device_thisversion=${GRUB_DEVICE} - fi - - if [ "x$is_first_entry" = xtrue ]; then - linux_entry "${OS}" "${version}" "${xen_version}" simple \ - "${GRUB_CMDLINE_LINUX} ${GRUB_CMDLINE_LINUX_DEFAULT}" "${GRUB_CMDLINE_XEN} ${GRUB_CMDLINE_XEN_DEFAULT}" - - submenu_indentation="\t\t" - - 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 (with Xen hypervisor)" "${OS}" | grub_quote)' \$menuentry_id_option 'gnulinux-advanced-$boot_device_id' {" - echo " submenu '$(gettext_printf "Xen hypervisor, version %s" "${xen_version}" | grub_quote)' \$menuentry_id_option 'xen-hypervisor-$xen_version-$boot_device_id' {" - fi - is_first_entry=false - - linux_entry "${OS}" "${version}" "${xen_version}" advanced \ - "${GRUB_CMDLINE_LINUX} ${GRUB_CMDLINE_LINUX_DEFAULT}" "${GRUB_CMDLINE_XEN} ${GRUB_CMDLINE_XEN_DEFAULT}" - if [ "x${GRUB_DISABLE_RECOVERY}" != "xtrue" ]; then - linux_entry "${OS}" "${version}" "${xen_version}" recovery \ - "single ${GRUB_CMDLINE_LINUX}" "${GRUB_CMDLINE_XEN}" - fi - - list=`echo $list | tr ' ' '\n' | grep -vx $linux | tr '\n' ' '` - done - if [ x"$is_first_entry" != xtrue ]; then - echo ' }' - fi - xen_list=`echo $xen_list | tr ' ' '\n' | grep -vx $current_xen | tr '\n' ' '` -done - -# If at least one kernel was found, then we need to -# add a closing '}' for the submenu command. -if [ x"$is_first_entry" != xtrue ]; then - echo '}' -fi - -echo "$title_correction_code" diff --git a/usr/share/archboot/grub2/etc/grub.d/20_memtest86+ b/usr/share/archboot/grub2/etc/grub.d/20_memtest86+ deleted file mode 100755 index 1d3096f6b..000000000 --- a/usr/share/archboot/grub2/etc/grub.d/20_memtest86+ +++ /dev/null @@ -1,29 +0,0 @@ -#! /bin/sh -e -######################################################## -# This script generates a memtest86+ entry on grub.cfg # -# if memtest is installed on the system. # -######################################################## - -prefix="/usr" -exec_prefix="${prefix}" - -datarootdir="/usr/share" -datadir="${datarootdir}" - -. "${datadir}/grub/grub-mkconfig_lib" - -MEMTEST86_IMAGE="/boot/memtest86+/memtest.bin" -CLASS="--class memtest86 --class gnu --class tool" - -if [ -e $MEMTEST86_IMAGE ] && is_path_readable_by_grub $MEMTEST86_IMAGE; then - # image exists, create menu entry - echo "Found memtest86+ image: $MEMTEST86_IMAGE" >&2 - cat << EOF -menuentry "Memory test (memtest86+)" $CLASS { -EOF - prepare_grub_to_access_device `${grub_probe} --target=device $MEMTEST86_IMAGE` | sed -e "s/^/ /" - cat << EOF - linux16 (\$root)`make_system_path_relative_to_its_root $MEMTEST86_IMAGE` -} -EOF -fi diff --git a/usr/share/archboot/grub2/etc/grub.d/30_os-prober b/usr/share/archboot/grub2/etc/grub.d/30_os-prober deleted file mode 100755 index 8a9d5667c..000000000 --- a/usr/share/archboot/grub2/etc/grub.d/30_os-prober +++ /dev/null @@ -1,273 +0,0 @@ -#! /bin/sh -set -e - -# grub-mkconfig helper script. -# Copyright (C) 2006,2007,2008,2009 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 . - -prefix="/usr" -exec_prefix="${prefix}" -datarootdir="/usr/share" - -export TEXTDOMAIN=grub -export TEXTDOMAINDIR="${datarootdir}/locale" - -. "${datarootdir}/grub/grub-mkconfig_lib" - -if [ "x${GRUB_DISABLE_OS_PROBER}" = "xtrue" ]; then - exit 0 -fi - -if [ -z "`which os-prober 2> /dev/null`" -o -z "`which linux-boot-prober 2> /dev/null`" ] ; then - # missing os-prober and/or linux-boot-prober - exit 0 -fi - -OSPROBED="`os-prober | tr ' ' '^' | paste -s -d ' '`" -if [ -z "${OSPROBED}" ] ; then - # empty os-prober output, nothing doing - exit 0 -fi - -osx_entry() { - if [ x$2 = x32 ]; then - # TRANSLATORS: it refers to kernel architecture (32-bit) - bitstr="$(gettext "(32-bit)")" - else - # TRANSLATORS: it refers to kernel architecture (64-bit) - bitstr="$(gettext "(64-bit)")" - fi - # TRANSLATORS: it refers on the OS residing on device %s - onstr="$(gettext_printf "(on %s)" "${DEVICE}")" - cat << EOF -menuentry '$(echo "${LONGNAME} $bitstr $onstr" | grub_quote)' --class osx --class darwin --class os \$menuentry_id_option 'osprober-xnu-$2-$(grub_get_device_id "${DEVICE}")' { -EOF - save_default_entry | sed -e "s/^/\t/" - prepare_grub_to_access_device ${DEVICE} | sed -e "s/^/\t/" - cat << EOF - load_video - set do_resume=0 - if [ /var/vm/sleepimage -nt10 / ]; then - if xnu_resume /var/vm/sleepimage; then - set do_resume=1 - fi - fi - if [ \$do_resume = 0 ]; then - xnu_uuid ${OSXUUID} uuid - if [ -f /Extra/DSDT.aml ]; then - acpi -e /Extra/DSDT.aml - fi - if [ /kernelcache -nt /System/Library/Extensions ]; then - $1 /kernelcache boot-uuid=\${uuid} rd=*uuid - else - $1 /mach_kernel boot-uuid=\${uuid} rd=*uuid - if [ /System/Library/Extensions.mkext -nt /System/Library/Extensions ]; then - xnu_mkext /System/Library/Extensions.mkext - else - xnu_kextdir /System/Library/Extensions - fi - fi - if [ -f /Extra/Extensions.mkext ]; then - xnu_mkext /Extra/Extensions.mkext - fi - if [ -d /Extra/Extensions ]; then - xnu_kextdir /Extra/Extensions - fi - if [ -f /Extra/devprop.bin ]; then - xnu_devprop_load /Extra/devprop.bin - fi - if [ -f /Extra/splash.jpg ]; then - insmod jpeg - xnu_splash /Extra/splash.jpg - fi - if [ -f /Extra/splash.png ]; then - insmod png - xnu_splash /Extra/splash.png - fi - if [ -f /Extra/splash.tga ]; then - insmod tga - xnu_splash /Extra/splash.tga - fi - fi -} -EOF -} - -used_osprober_linux_ids= - -for OS in ${OSPROBED} ; do - DEVICE="`echo ${OS} | cut -d ':' -f 1`" - LONGNAME="`echo ${OS} | cut -d ':' -f 2 | tr '^' ' '`" - LABEL="`echo ${OS} | cut -d ':' -f 3 | tr '^' ' '`" - BOOT="`echo ${OS} | cut -d ':' -f 4`" - - if [ -z "${LONGNAME}" ] ; then - LONGNAME="${LABEL}" - fi - - gettext_printf "Found %s on %s\n" "${LONGNAME}" "${DEVICE}" >&2 - - case ${BOOT} in - chain) - - onstr="$(gettext_printf "(on %s)" "${DEVICE}")" - cat << EOF -menuentry '$(echo "${LONGNAME} $onstr" | grub_quote)' --class windows --class os \$menuentry_id_option 'osprober-chain-$(grub_get_device_id "${DEVICE}")' { -EOF - save_default_entry | sed -e "s/^/\t/" - prepare_grub_to_access_device ${DEVICE} | sed -e "s/^/\t/" - - case ${LONGNAME} in - Windows\ Vista*|Windows\ 7*|Windows\ Server\ 2008*) - ;; - *) - cat << EOF - drivemap -s (hd0) \${root} -EOF - ;; - esac - - cat < /dev/null; do - counter=$((counter+1)); - done - if [ -z "$boot_device_id" ]; then - boot_device_id="$(grub_get_device_id "${DEVICE}")" - fi - used_osprober_linux_ids="$used_osprober_linux_ids 'osprober-gnulinux-$LKERNEL-${recovery_params}-$counter-$boot_device_id'" - - if [ -z "${prepare_boot_cache}" ]; then - prepare_boot_cache="$(prepare_grub_to_access_device ${LBOOT} | sed -e "s/^/\t/")" - fi - - if [ "x$is_first_entry" = xtrue ]; then - cat << EOF -menuentry '$(echo "$OS" | grub_quote)' --class gnu-linux --class gnu --class os \$menuentry_id_option 'osprober-gnulinux-simple-$boot_device_id' { -EOF - save_default_entry | sed -e "s/^/\t/" - printf '%s\n' "${prepare_boot_cache}" - cat << EOF - linux ${LKERNEL} ${LPARAMS} -EOF - if [ -n "${LINITRD}" ] ; then - cat << EOF - initrd ${LINITRD} -EOF - fi - cat << EOF -} -EOF - echo "submenu '$(gettext_printf "Advanced options for %s" "${OS}" | grub_quote)' \$menuentry_id_option 'osprober-gnulinux-advanced-$boot_device_id' {" - is_first_entry=false - fi - title="${LLABEL} $onstr" - cat << EOF - menuentry '$(echo "$title" | grub_quote)' --class gnu-linux --class gnu --class os \$menuentry_id_option 'osprober-gnulinux-$LKERNEL-${recovery_params}-$boot_device_id' { -EOF - save_default_entry | sed -e "s/^/\t\t/" - printf '%s\n' "${prepare_boot_cache}" | sed -e "s/^/\t/" - cat << EOF - linux ${LKERNEL} ${LPARAMS} -EOF - if [ -n "${LINITRD}" ] ; then - cat << EOF - initrd ${LINITRD} -EOF - fi - cat << EOF - } -EOF - 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 - done - if [ x"$is_first_entry" != xtrue ]; then - echo '}' - fi - echo "$title_correction_code" - ;; - macosx) - OSXUUID="`${grub_probe} --target=fs_uuid --device ${DEVICE} 2> /dev/null`" - osx_entry xnu_kernel 32 - osx_entry xnu_kernel64 64 - ;; - hurd) - onstr="$(gettext_printf "(on %s)" "${DEVICE}")" - cat << EOF -menuentry '$(echo "${LONGNAME} $onstr" | grub_quote)' --class hurd --class gnu --class os \$menuentry_id_option 'osprober-gnuhurd-/boot/gnumach.gz-false-$(grub_get_device_id "${DEVICE}")' { -EOF - save_default_entry | sed -e "s/^/\t/" - prepare_grub_to_access_device ${DEVICE} | sed -e "s/^/\t/" - grub_device="`${grub_probe} --device ${DEVICE} --target=drive`" - mach_device="`echo "${grub_device}" | sed -e 's/(\(hd.*\),msdos\(.*\))/\1s\2/'`" - grub_fs="`${grub_probe} --device ${DEVICE} --target=fs`" - case "${grub_fs}" in - *fs) hurd_fs="${grub_fs}" ;; - *) hurd_fs="${grub_fs}fs" ;; - esac - cat << EOF - multiboot /boot/gnumach.gz root=device:${mach_device} - module /hurd/${hurd_fs}.static ${hurd_fs} --readonly \\ - --multiboot-command-line='\${kernel-command-line}' \\ - --host-priv-port='\${host-port}' \\ - --device-master-port='\${device-port}' \\ - --exec-server-task='\${exec-task}' -T typed '\${root}' \\ - '\$(task-create)' '\$(task-resume)' - module /lib/ld.so.1 exec /hurd/exec '\$(exec-task=task-create)' -} -EOF - ;; - *) - echo -n " " - # TRANSLATORS: %s is replaced by OS name. - gettext_printf "%s is not yet supported by grub-mkconfig.\n" "${LONGNAME}" >&2 - ;; - esac -done diff --git a/usr/share/archboot/grub2/etc/grub.d/40_custom b/usr/share/archboot/grub2/etc/grub.d/40_custom deleted file mode 100755 index 48068de46..000000000 --- a/usr/share/archboot/grub2/etc/grub.d/40_custom +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/sh -exec tail -n +3 $0 -# This file provides an easy way to add custom menu entries. Simply type the -# menu entries you want to add after this comment. Be careful not to change -# the 'exec tail' line above. diff --git a/usr/share/archboot/grub2/etc/grub.d/41_custom b/usr/share/archboot/grub2/etc/grub.d/41_custom deleted file mode 100755 index 64d691c55..000000000 --- a/usr/share/archboot/grub2/etc/grub.d/41_custom +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/sh -cat <