Simplify Dracut cmdline script
We don't actually need a real value for the root kernel param, and requiring one causes problems for things like the discovery ramdisk that don't pass in a disk= parameter. Dracut seems to be happy to take /dev/zero as the value, so we can just always use that. Change-Id: Ia724f0214c26aa18c6f8f41f2c48d7f25b52ee6c
This commit is contained in:
		@@ -3,26 +3,10 @@
 | 
			
		||||
# NOTE(bnemec): Dracut doesn't like it if we enable these
 | 
			
		||||
# dib-lint: disable=setu sete setpipefail
 | 
			
		||||
 | 
			
		||||
source /init-func
 | 
			
		||||
 | 
			
		||||
find_target() {
 | 
			
		||||
    local DISK=$(getarg disk)
 | 
			
		||||
    local target_disk=
 | 
			
		||||
    t=0
 | 
			
		||||
    while ! target_disk=$(find_disk "$DISK"); do
 | 
			
		||||
        if [ $t -eq 10 ]; then
 | 
			
		||||
            break
 | 
			
		||||
        fi
 | 
			
		||||
        t=$(($t + 1))
 | 
			
		||||
        sleep 1
 | 
			
		||||
    done
 | 
			
		||||
    echo $target_disk
 | 
			
		||||
}
 | 
			
		||||
root=$(find_target)
 | 
			
		||||
 | 
			
		||||
if [ -n "$root" ]; then
 | 
			
		||||
    rootok=1
 | 
			
		||||
fi
 | 
			
		||||
# We never let Dracut boot off the specified root anyway, so all
 | 
			
		||||
# we need is a value it will accept.
 | 
			
		||||
root=/dev/zero
 | 
			
		||||
rootok=1
 | 
			
		||||
 | 
			
		||||
# Dracut doesn't correctly parse the ip argument passed to us.
 | 
			
		||||
# Override /proc/cmdline to rewrite it in a way dracut can grok.
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user