Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
dadigang
Ventoy
Commits
602e8c7f
Commit
602e8c7f
authored
Jul 12, 2022
by
longpanda
Browse files
Fix a bug when rhel based distribution has an external kickstart file. (#1717)
parent
da35a99f
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
48 additions
and
2 deletions
+48
-2
IMG/cpio/ventoy/hook/openEuler/ventoy-autoexp.sh
IMG/cpio/ventoy/hook/openEuler/ventoy-autoexp.sh
+24
-0
IMG/cpio/ventoy/hook/openEuler/ventoy-hook.sh
IMG/cpio/ventoy/hook/openEuler/ventoy-hook.sh
+14
-1
IMG/cpio/ventoy/hook/rhel7/ventoy-hook.sh
IMG/cpio/ventoy/hook/rhel7/ventoy-hook.sh
+10
-1
No files found.
IMG/cpio/ventoy/hook/openEuler/ventoy-autoexp.sh
0 → 100644
View file @
602e8c7f
#!/bin/sh
#************************************************************************************
# Copyright (c) 2022, longpanda <admin@ventoy.net>
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License as
# published by the Free Software Foundation; either version 3 of the
# License, or (at your option) any later version.
#
# This program is distributed in the hope that it will be useful, but
# WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
# General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, see <http://www.gnu.org/licenses/>.
#
#************************************************************************************
if
[
-f
/run/install/ks.cfg
]
;
then
sh /ventoy/hook/default/auto_install_varexp.sh /run/install/ks.cfg
fi
exit
0
IMG/cpio/ventoy/hook/openEuler/ventoy-hook.sh
View file @
602e8c7f
...
@@ -24,18 +24,21 @@ if [ -f $VTOY_PATH/autoinstall ]; then
...
@@ -24,18 +24,21 @@ if [ -f $VTOY_PATH/autoinstall ]; then
else
else
for
vtParam
in
$(
$CAT
/proc/cmdline
)
;
do
for
vtParam
in
$(
$CAT
/proc/cmdline
)
;
do
if
echo
$vtParam
|
$GREP
-q
'inst.ks=hd:LABEL='
;
then
if
echo
$vtParam
|
$GREP
-q
'inst.ks=hd:LABEL='
;
then
vtRawKsFull
=
"
$vtParam
"
vtRawKs
=
$(
echo
$vtParam
|
$AWK
-F
:
'{print $NF}'
)
vtRawKs
=
$(
echo
$vtParam
|
$AWK
-F
:
'{print $NF}'
)
VTKS
=
"inst.ks=hd:/dev/ventoy:
$vtRawKs
"
VTKS
=
"inst.ks=hd:/dev/ventoy:
$vtRawKs
"
break
break
fi
fi
if
echo
$vtParam
|
$GREP
-q
'^ks=.*:/'
;
then
if
echo
$vtParam
|
$GREP
-q
'^ks=.*:/'
;
then
vtRawKsFull
=
"
$vtParam
"
vtRawKs
=
$(
echo
$vtParam
|
$AWK
-F
:
'{print $NF}'
)
vtRawKs
=
$(
echo
$vtParam
|
$AWK
-F
:
'{print $NF}'
)
VTKS
=
"ks=hd:/dev/ventoy:
$vtRawKs
"
VTKS
=
"ks=hd:/dev/ventoy:
$vtRawKs
"
break
break
fi
fi
if
echo
$vtParam
|
$GREP
-q
'^inst.ks=.*:/'
;
then
if
echo
$vtParam
|
$GREP
-q
'^inst.ks=.*:/'
;
then
vtRawKsFull
=
"
$vtParam
"
vtRawKs
=
$(
echo
$vtParam
|
$AWK
-F
:
'{print $NF}'
)
vtRawKs
=
$(
echo
$vtParam
|
$AWK
-F
:
'{print $NF}'
)
VTKS
=
"inst.ks=hd:/dev/ventoy:
$vtRawKs
"
VTKS
=
"inst.ks=hd:/dev/ventoy:
$vtRawKs
"
break
break
...
@@ -63,7 +66,13 @@ fi
...
@@ -63,7 +66,13 @@ fi
echo
"VTKS=
$VTKS
VTOVERLAY=
$VTOVERLAY
"
>>
$VTLOG
echo
"VTKS=
$VTKS
VTOVERLAY=
$VTOVERLAY
"
>>
$VTLOG
if
[
-n
"
$vtRawKs
"
]
;
then
if
[
-n
"
$vtRawKs
"
]
;
then
if
echo
$vtRawKsFull
|
$EGREP
-q
"=http|=https|=ftp|=nfs|=hmc"
;
then
echo
"vtRawKsFull=
$vtRawKsFull
no patch needed."
>>
$VTLOG
vtRawKs
=
""
VTKS
=
""
else
echo
"
$vtRawKs
"
>
$VTOY_PATH
/ventoy_ks_rootpath
echo
"
$vtRawKs
"
>
$VTOY_PATH
/ventoy_ks_rootpath
fi
fi
fi
if
ls
$VTOY_PATH
|
$GREP
-q
'ventoy_dud[0-9]'
;
then
if
ls
$VTOY_PATH
|
$GREP
-q
'ventoy_dud[0-9]'
;
then
...
@@ -98,3 +107,7 @@ if [ -f /usr/sbin/anaconda-diskroot ]; then
...
@@ -98,3 +107,7 @@ if [ -f /usr/sbin/anaconda-diskroot ]; then
$SED
's/^mount $dev $repodir/mount -oro $dev $repodir/'
-i
/usr/sbin/anaconda-diskroot
$SED
's/^mount $dev $repodir/mount -oro $dev $repodir/'
-i
/usr/sbin/anaconda-diskroot
fi
fi
if
[
-f
$VTOY_PATH
/autoinstall
]
;
then
cp
-a
$VTOY_PATH
/hook/openEuler/ventoy-autoexp.sh /lib/dracut/hooks/pre-mount/99-ventoy-autoexp.sh
fi
IMG/cpio/ventoy/hook/rhel7/ventoy-hook.sh
View file @
602e8c7f
...
@@ -27,18 +27,21 @@ if [ -f $VTOY_PATH/autoinstall ]; then
...
@@ -27,18 +27,21 @@ if [ -f $VTOY_PATH/autoinstall ]; then
else
else
for
vtParam
in
$(
$CAT
/proc/cmdline
)
;
do
for
vtParam
in
$(
$CAT
/proc/cmdline
)
;
do
if
echo
$vtParam
|
$GREP
-q
'inst.ks=hd:LABEL='
;
then
if
echo
$vtParam
|
$GREP
-q
'inst.ks=hd:LABEL='
;
then
vtRawKsFull
=
"
$vtParam
"
vtRawKs
=
$(
echo
$vtParam
|
$AWK
-F
:
'{print $NF}'
)
vtRawKs
=
$(
echo
$vtParam
|
$AWK
-F
:
'{print $NF}'
)
VTKS
=
"inst.ks=hd:/dev/ventoy:
$vtRawKs
"
VTKS
=
"inst.ks=hd:/dev/ventoy:
$vtRawKs
"
break
break
fi
fi
if
echo
$vtParam
|
$GREP
-q
'^ks=.*:/'
;
then
if
echo
$vtParam
|
$GREP
-q
'^ks=.*:/'
;
then
vtRawKsFull
=
"
$vtParam
"
vtRawKs
=
$(
echo
$vtParam
|
$AWK
-F
:
'{print $NF}'
)
vtRawKs
=
$(
echo
$vtParam
|
$AWK
-F
:
'{print $NF}'
)
VTKS
=
"ks=hd:/dev/ventoy:
$vtRawKs
"
VTKS
=
"ks=hd:/dev/ventoy:
$vtRawKs
"
break
break
fi
fi
if
echo
$vtParam
|
$GREP
-q
'^inst.ks=.*:/'
;
then
if
echo
$vtParam
|
$GREP
-q
'^inst.ks=.*:/'
;
then
vtRawKsFull
=
"
$vtParam
"
vtRawKs
=
$(
echo
$vtParam
|
$AWK
-F
:
'{print $NF}'
)
vtRawKs
=
$(
echo
$vtParam
|
$AWK
-F
:
'{print $NF}'
)
VTKS
=
"inst.ks=hd:/dev/ventoy:
$vtRawKs
"
VTKS
=
"inst.ks=hd:/dev/ventoy:
$vtRawKs
"
break
break
...
@@ -67,7 +70,13 @@ fi
...
@@ -67,7 +70,13 @@ fi
echo
"VTKS=
$VTKS
VTOVERLAY=
$VTOVERLAY
"
>>
$VTLOG
echo
"VTKS=
$VTKS
VTOVERLAY=
$VTOVERLAY
"
>>
$VTLOG
if
[
-n
"
$vtRawKs
"
]
;
then
if
[
-n
"
$vtRawKs
"
]
;
then
if
echo
$vtRawKsFull
|
$EGREP
-q
"=http|=https|=ftp|=nfs|=hmc"
;
then
echo
"vtRawKsFull=
$vtRawKsFull
no patch needed."
>>
$VTLOG
vtRawKs
=
""
VTKS
=
""
else
echo
"
$vtRawKs
"
>
$VTOY_PATH
/ventoy_ks_rootpath
echo
"
$vtRawKs
"
>
$VTOY_PATH
/ventoy_ks_rootpath
fi
fi
fi
if
ls
$VTOY_PATH
|
$GREP
-q
'ventoy_dud[0-9]'
;
then
if
ls
$VTOY_PATH
|
$GREP
-q
'ventoy_dud[0-9]'
;
then
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment