mirror of
ssh://git.janware.com/srv/git/janware/proj/jw-pkg
synced 2026-01-20 13:37:38 +01:00
integrate-distro.sh: Integrate-distro.sh informative-only commands are not run before ssh
Signed-off-by: Jan Lindemann <jan@janware.com>
This commit is contained in:
parent
15f3e12fca
commit
d6847deaf0
1 changed files with 21 additions and 12 deletions
|
|
@ -411,7 +411,7 @@ usage()
|
||||||
echo "
|
echo "
|
||||||
|
|
||||||
usage: $myname -h
|
usage: $myname -h
|
||||||
$myname [options] [install|mount|unmount|mkinitrd|fs|parted-script]
|
$myname [options] [install|mount|unmount|mkinitrd|fs|parted-script|root-dir]
|
||||||
|
|
||||||
options:
|
options:
|
||||||
-f
|
-f
|
||||||
|
|
@ -910,7 +910,7 @@ make_boot_menu()
|
||||||
|default 0
|
|default 0
|
||||||
|timeout 8
|
|timeout 8
|
||||||
|##YaST - generic_mbr
|
|##YaST - generic_mbr
|
||||||
|gfxmenu ($disk,$grub_slash_boot_partition_num)/message
|
|# gfxmenu ($disk,$grub_slash_boot_partition_num)/message
|
||||||
|
|
|
|
||||||
|title Default
|
|title Default
|
||||||
| root ($disk,$grub_slash_boot_partition_num)
|
| root ($disk,$grub_slash_boot_partition_num)
|
||||||
|
|
@ -919,7 +919,7 @@ make_boot_menu()
|
||||||
|
|
|
|
||||||
|title Failsafe
|
|title Failsafe
|
||||||
| root ($disk,$grub_slash_boot_partition_num)
|
| root ($disk,$grub_slash_boot_partition_num)
|
||||||
| kernel /vmlinuz root=$run_dev_root showopts apm=off noresume edd=off powersaved=off nohz=off highres=off processor.max_cstate=1 nomodeset x11failsafe
|
| kernel /vmlinuz root=$run_dev_root showopts apm=off noresume edd=off powersaved=off nohz=off highres=off processor.max_cstate=1 nomodeset x11failsafe rdinitdebug rdshell
|
||||||
| initrd /initrd-local
|
| initrd /initrd-local
|
||||||
|
|
|
|
||||||
|title Default $kernel_version
|
|title Default $kernel_version
|
||||||
|
|
@ -1301,6 +1301,24 @@ x86_64|"")
|
||||||
die "invalid architecture $arch specified";;
|
die "invalid architecture $arch specified";;
|
||||||
esac
|
esac
|
||||||
|
|
||||||
|
if [ "$o_root" ]; then
|
||||||
|
root=$o_root/ro
|
||||||
|
else
|
||||||
|
root=/srv/nfs/boot/distros/$o_name-$arch/ro
|
||||||
|
fi
|
||||||
|
|
||||||
|
case $cmd in
|
||||||
|
parted-script)
|
||||||
|
parted_script
|
||||||
|
;;
|
||||||
|
root-dir)
|
||||||
|
echo $root
|
||||||
|
exit $?
|
||||||
|
;;
|
||||||
|
*)
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
|
||||||
if [ `whoami` != root -o "$l32" ]; then
|
if [ `whoami` != root -o "$l32" ]; then
|
||||||
[ ! "$scm_user" ] && scm_user=`whoami`
|
[ ! "$scm_user" ] && scm_user=`whoami`
|
||||||
exe=$0
|
exe=$0
|
||||||
|
|
@ -1322,12 +1340,6 @@ fi
|
||||||
|
|
||||||
[ ! "$scm_user" ] && scm_user=`whoami`
|
[ ! "$scm_user" ] && scm_user=`whoami`
|
||||||
|
|
||||||
if [ "$o_root" ]; then
|
|
||||||
root=$o_root/ro
|
|
||||||
else
|
|
||||||
root=/srv/nfs/boot/distros/$o_name-$arch/ro
|
|
||||||
fi
|
|
||||||
|
|
||||||
# -- set up variables denoting devices
|
# -- set up variables denoting devices
|
||||||
|
|
||||||
if [ "$install_dev" ]; then
|
if [ "$install_dev" ]; then
|
||||||
|
|
@ -1402,9 +1414,6 @@ mkinitrd)
|
||||||
setup_boot_loader_net
|
setup_boot_loader_net
|
||||||
exit $?
|
exit $?
|
||||||
;;
|
;;
|
||||||
parted-script)
|
|
||||||
parted_script
|
|
||||||
;;
|
|
||||||
*)
|
*)
|
||||||
log "unknown command \"$cmd\""
|
log "unknown command \"$cmd\""
|
||||||
usage 1
|
usage 1
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue