]> git.ipfire.org Git - people/pmueller/ipfire-2.x.git/blob - src/patches/dracut-init_start_ipfireinstaller.patch
Fix xen build.
[people/pmueller/ipfire-2.x.git] / src / patches / dracut-init_start_ipfireinstaller.patch
1 diff -Naur org/init new/init
2 --- init 2010-06-17 10:46:29.000000000 +0200
3 +++ init 2010-08-10 17:55:41.000000000 +0200
4 @@ -111,8 +111,9 @@
5 getarg 'rdbreak=cmdline' && emergency_shell -n cmdline "Break before cmdline"
6 source_all cmdline
7
8 -[ -z "$root" ] && die "No or empty root= argument"
9 -[ -z "$rootok" ] && die "Don't know how to handle 'root=$root'"
10 +# Disable root argument check ...
11 +#[ -z "$root" ] && die "No or empty root= argument"
12 +#[ -z "$rootok" ] && die "Don't know how to handle 'root=$root'"
13
14 # Network root scripts may need updated root= options,
15 # so deposit them where they can see them (udev purges the env)
16 @@ -202,12 +203,15 @@
17 done
18
19 i=$(($i+1))
20 - [ $i -gt $RDRETRY ] \
21 - && { flock -s 9 ; emergency_shell "No root device found"; } 9>/.console_lock
22 + # Start IPFire installer after root was not found ;)
23 + [ $i -gt $RDRETRY ] && break 2;
24 +
25 done
26 unset job
27 unset queuetriggered
28
29 +/etc/rc_installer
30 +
31 # pre-mount happens before we try to mount the root filesystem,
32 # and happens once.
33 getarg 'rdbreak=pre-mount' && emergency_shell -n pre-mount "Break pre-mount"