echo -n " kernel-img.conf"
# generate initial grub loaders
-if [ ! -d /boot/grub ]; then
- mkdir -p /boot/grub
+if [ ! -d "$grub_dir" ]; then
+ mkdir -p "$grub_dir"
+ # x86
if [ -d /usr/lib/grub/i386-pc ]; then
- cp -a /usr/lib/grub/i386-pc/* /boot/grub
+ cp -a /usr/lib/grub/i386-pc/* "$grub_dir"
+ # x86_64
+ elif [ -d /usr/lib/grub/x86_64-pc ]; then
+ cp -a /usr/lib/grub/x86_64-pc/* "$grub_dir"
fi
fi
echo -n " grub1"
# create/update grub configuration
-if [ -e /boot/grub/menu.lst ]; then
+if [ -e "$menu_file" ]; then
# is there uncompatibile grub conf present?
- if ! grep -q 'AUTOMAGIC KERNELS LIST' /boot/grub/menu.lst; then
- mv -f /boot/grub/menu.lst /boot/grub/menu.lst.old
+ if ! grep -q 'AUTOMAGIC KERNELS LIST' "$menu_file"; then
+ mv -f "$menu_file" "$menu_file.old"
fi
fi
-if [ ! -e /boot/grub/menu.lst ]; then
+if [ ! -e "$menu_file" ]; then
yes | /usr/sbin/update-grub >/dev/null 2>&1 || true
else
/usr/sbin/update-grub >/dev/null 2>&1 || true
# workaround execshield
SHIELD=$(sysctl -e -n kernel.exec-shield)
if [ ! -z "$SHIELD" ]; then
- sysctl -w -e kernel.exec-shield=0 >/dev/null 2>&1
+ sysctl -e -w kernel.exec-shield=0 >/dev/null 2>&1
echo -n " execshield1"
fi
# remove obsolete devfs/compat links and restore normal udev behaviour
rm -f /etc/udev/rules.d/devfs.rules /etc/udev/rules.d/compat.rules \
/etc/udev/rules.d/compat-full.rules
-if [ ! -e /etc/udev/rules.d/udev.rules ]; then
- ln -s ../udev.rules /etc/udev/rules.d/udev.rules
-fi
-udevcontrol reload_rules >/dev/null 2>&1 || true
+#if [ ! -e /etc/udev/rules.d/udev.rules ]; then
+# ln -s ../udev.rules /etc/udev/rules.d/udev.rules
+#fi
+udevadm control --reload_rules >/dev/null 2>&1 || true
+udevsettle || true
echo -n " udev"
# update device map if possible
-device_map=/boot/grub/device.map
-if [ -f $device_map ]; then
- mv -f $device_map $device_map.old
+if [ -f "$device_map" ]; then
+ mv -f "$device_map" "$device_map.old"
fi
-grub --batch --no-floppy --device-map=$device_map <<EOF >/dev/null 2>&1
+grub --batch --no-floppy --device-map="$device_map" <<EOF >/dev/null 2>&1
quit
EOF
-if [ ! -s $device_map ]; then
- if [ -f $device_map.old ]; then
- mv -f $device_map.old $device_map
+if [ ! -s "$device_map" ]; then
+ if [ -f "$device_map.old" ]; then
+ mv -f "$device_map.old" "$device_map"
fi
+
else
- rm -f $device_map.old
+ rm -f "$device_map.old"
fi
echo -n " grub4"
-# install GRUB loader
-install_device=$(grep '^(hd0)' $device_map | \
+# import GRUB helper functions (again, updated device map)
+. /usr/share/kernel-2.6-cn/grub-functions.sh
+
+# get install device (0x80 BIOS device)
+install_device=$(grep '^(hd0)' "$device_map" | \
sed -e 's%[^[:space:]]*[[:space:]]*\([^[:space:]]*\)%\1%')
if [ -z "$install_device" ]; then
echo "."
echo "CN: Do not reboot your server and report this to OTRS immediately!"
exit 1
fi
+
+# oops, install device is a symlink...
+if [ -h "$install_device" ]; then
+ install_device_resolved=$(resolve_symlink "$install_device")
+ if [ -z "$install_device_resolved" ]; then
+ install_device_resolved="$install_device"
+ fi
+
+ # try to fix device map with symlink resolved device
+ if [ "x$install_device_resolved" != "x$install_device" ]; then
+ cp_check_and_sed '^\(hd0\)' \
+ "s;^(hd0).*;(hd0) $install_device_resolved;" "$device_map" \
+ || true
+ fi
+fi
+echo -n " grub5"
+
+# install GRUB loader
if ! grub-install --no-floppy "$install_device" >/dev/null 2>&1; then
echo "."
echo "CN: FATAL ERROR while running grub-install!"
echo "CN: Do not reboot your server and report this to OTRS immediately!"
exit 1
fi
-echo -n " grub5"
+echo -n " grub6"
# fix possible wrong params in menu.lst
cp_check_and_sed '^# groot=' \
"s;^# groot=.*;# groot=$grub_root_device;g" \
- /boot/grub/menu.lst || true
+ "$menu_file" || true
cp_check_and_sed '^# kopt=' \
"s;^# kopt=\(.*\)root=[^[:space:]]*\(.*\);# kopt=\1root=$root_device\2;g" \
- /boot/grub/menu.lst || true
+ "$menu_file" || true
/usr/sbin/update-grub >/dev/null 2>&1 || true
-echo -n " grub6"
+echo -n " grub7"
+
+# and final stage of devfs/udev brokeness fix
+if [ "x$install_device_resolved" != "x$install_device" ]; then
+ # get original (symlinked device)
+ root_device=$(find_device_nonresolved "/")
+ if [ -z "$root_device" ]; then
+ root_device=$(find_root_device)
+ fi
+
+ # fix (hd0) mapping
+ cp_check_and_sed '^\(hd0\)' \
+ "s;^(hd0).*;(hd0) $install_device;" "$device_map" \
+ || true
+
+ # fix global root= invocation
+ cp_check_and_sed '^# kopt=' \
+ "s;^# kopt=\(.*\)root=[^[:space:]]*\(.*\);# kopt=\1root=$root_device\2;g" \
+ "$menu_file" || true
+
+ # fix root= invocation for individual kernel profiles
+ cp_check_and_sed '^kernel' \
+ "s;\(^kernel.*\)root=[^[:space:]]*\(.*\);\1root=$root_device\2;g" \
+ "$menu_file" || true
+fi
+echo -n " grub8"
# restore execshield state
if [ ! -z "$SHIELD" ]; then
- sysctl -w -e "kernel.exec-shield=$SHIELD" >/dev/null 2>&1
+ sysctl -e -w "kernel.exec-shield=$SHIELD" >/dev/null 2>&1
echo -n " execshield2"
fi
echo -n " mdadm"
fi
-# update initramfs accordingly
+# update initramfs accordingly (because of mdadm and udev)
update-initramfs -u -k all >/dev/null 2>&1 || true
echo -n " initramfs"
projects / kernel-cn.git / blobdiff