Subversion Repositories configs

Rev

Rev 95 | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 95 Rev 128
Line 153... Line 153...
153
    if [ "$cmdline" == "$newstr" ]; then
153
    if [ "$cmdline" == "$newstr" ]; then
154
        cmdline="${cmdline} ${2}=${3}"
154
        cmdline="${cmdline} ${2}=${3}"
155
    fi
155
    fi
156
 
156
 
157
    echo $cmdline
157
    echo $cmdline
-
 
158
}
-
 
159
 
-
 
160
# This function fix root=by-path, since we can not parse it in the 2nd kernel
-
 
161
function fix_cmdline_rootdev()
-
 
162
{
-
 
163
	local cmdline=$1
-
 
164
	local rootdev
-
 
165
	local rootuuid
-
 
166
	local is_bypath
-
 
167
	rootdev=$(echo $cmdline | sed 's/^.*root=//' | cut -d" " -f1)
-
 
168
	if [ -n "$rootdev" ]; then
-
 
169
		is_bypath=$(echo $rootdev| grep by-path)
-
 
170
		if [ -n "$is_bypath" ]; then
-
 
171
			cmdline=`remove_cmdline_param "$cmdline" root`
-
 
172
			rootuuid=`findmnt -k -f -n -r -o UUID /`
-
 
173
			if [ -n "$rootuuid" ]; then
-
 
174
				cmdline="$cmdline root=UUID=$rootuuid"
-
 
175
			fi
-
 
176
		fi
-
 
177
	fi
-
 
178
	echo $cmdline
158
}
179
}
159
 
180
 
160
# This function performs a series of edits on the command line
181
# This function performs a series of edits on the command line
161
function prepare_cmdline()
182
function prepare_cmdline()
162
{
183
{
Line 165... Line 186...
165
		cmdline=`cat /proc/cmdline`
186
		cmdline=`cat /proc/cmdline`
166
	else
187
	else
167
		cmdline=${KDUMP_COMMANDLINE}
188
		cmdline=${KDUMP_COMMANDLINE}
168
	fi
189
	fi
169
	cmdline=`remove_cmdline_param "$cmdline" crashkernel mem hugepages hugepagesz`
190
	cmdline=`remove_cmdline_param "$cmdline" crashkernel mem hugepages hugepagesz`
-
 
191
	cmdline=$(fix_cmdline_rootdev "$cmdline")
170
	cmdline="${cmdline} ${KDUMP_COMMANDLINE_APPEND}"
192
	cmdline="${cmdline} ${KDUMP_COMMANDLINE_APPEND}"
171
	avoid_cdrom_drive
193
	avoid_cdrom_drive
172
	KDUMP_COMMANDLINE="${KDUMP_COMMANDLINE} ${KDUMP_IDE_NOPROBE_COMMANDLINE}"
194
	KDUMP_COMMANDLINE="${KDUMP_COMMANDLINE} ${KDUMP_IDE_NOPROBE_COMMANDLINE}"
173
 
195
 
174
	local id=`get_bootcpu_initial_apicid`
196
	local id=`get_bootcpu_initial_apicid`