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
682e8cdc
"vscode:/vscode.git/clone" did not exist on "5f6294bd04cbf099c2dc15b9aebc44ebe91f0044"
Commit
682e8cdc
authored
Apr 16, 2022
by
longpanda
Browse files
Fixe the boot issue for Fedora when VTOY_LINUX_REMOUNT=1
parent
1882cfcc
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
18 additions
and
8 deletions
+18
-8
IMG/cpio/ventoy/hook/rhel7/ventoy-inotifyd-hook.sh
IMG/cpio/ventoy/hook/rhel7/ventoy-inotifyd-hook.sh
+12
-8
IMG/cpio/ventoy/hook/rhel7/ventoy-make-link.sh
IMG/cpio/ventoy/hook/rhel7/ventoy-make-link.sh
+4
-0
IMG/cpio/ventoy/hook/ventoy-hook-lib.sh
IMG/cpio/ventoy/hook/ventoy-hook-lib.sh
+2
-0
No files found.
IMG/cpio/ventoy/hook/rhel7/ventoy-inotifyd-hook.sh
View file @
682e8cdc
...
@@ -29,14 +29,7 @@ if is_inotify_ventoy_part $3; then
...
@@ -29,14 +29,7 @@ if is_inotify_ventoy_part $3; then
vtlog
"##### INOTIFYD:
$2
/
$3
is created (YES) ..."
vtlog
"##### INOTIFYD:
$2
/
$3
is created (YES) ..."
vtGenRulFile
=
'/etc/udev/rules.d/99-live-squash.rules'
if
[
-e
$vtGenRulFile
]
&&
$GREP
-q
dmsquash
$vtGenRulFile
;
then
vtScript
=
$(
$GREP
-m1
'RUN.='
$vtGenRulFile
|
$AWK
-F
'RUN.='
'{print $2}'
|
$SED
's/"\(.*\)".*/\1/'
)
vtlog
"vtScript=
$vtScript
"
$vtScript
else
vtlog
"
$vtGenRulFile
not exist..."
fi
vtlog
"find ventoy partition ..."
vtlog
"find ventoy partition ..."
...
@@ -57,6 +50,17 @@ if is_inotify_ventoy_part $3; then
...
@@ -57,6 +50,17 @@ if is_inotify_ventoy_part $3; then
ventoy_swap_device /dev/dm-0 /dev/
$vtDM
ventoy_swap_device /dev/dm-0 /dev/
$vtDM
fi
fi
vtGenRulFile
=
'/etc/udev/rules.d/99-live-squash.rules'
if
[
-e
$vtGenRulFile
]
&&
$GREP
-q
dmsquash
$vtGenRulFile
;
then
vtScript
=
$(
$GREP
-m1
'RUN.='
$vtGenRulFile
|
$AWK
-F
'RUN.='
'{print $2}'
|
$SED
's/"\(.*\)".*/\1/'
)
vtlog
"vtScript=
$vtScript
"
$vtScript
else
vtlog
"
$vtGenRulFile
not exist..."
fi
if
[
-e
/sbin/anaconda-diskroot
]
;
then
if
[
-e
/sbin/anaconda-diskroot
]
;
then
vtlog
"set anaconda-diskroot ..."
vtlog
"set anaconda-diskroot ..."
/sbin/anaconda-diskroot /dev/dm-0
/sbin/anaconda-diskroot /dev/dm-0
...
...
IMG/cpio/ventoy/hook/rhel7/ventoy-make-link.sh
View file @
682e8cdc
...
@@ -19,6 +19,10 @@
...
@@ -19,6 +19,10 @@
.
/ventoy/hook/ventoy-hook-lib.sh
.
/ventoy/hook/ventoy-hook-lib.sh
if
[
!
-e
/dev/dm-0
]
;
then
exit
0
fi
if
!
[
-e
/dev/mapper/ventoy
]
;
then
if
!
[
-e
/dev/mapper/ventoy
]
;
then
vtlog
"link to /dev/mapper/ventoy"
vtlog
"link to /dev/mapper/ventoy"
ln
-s
/dev/dm-0 /dev/mapper/ventoy
ln
-s
/dev/dm-0 /dev/mapper/ventoy
...
...
IMG/cpio/ventoy/hook/ventoy-hook-lib.sh
View file @
682e8cdc
...
@@ -350,10 +350,12 @@ ventoy_dm_patch() {
...
@@ -350,10 +350,12 @@ ventoy_dm_patch() {
fi
fi
#step1: modify vermagic/mod crc/relocation
#step1: modify vermagic/mod crc/relocation
vtlog
"
$VTOY_PATH
/tool/vtoykmod -u
$VTOY_PATH
/tool/
$vtKoName
$VTOY_PATH
/
$vtModName
$vtDebug
"
$VTOY_PATH
/tool/vtoykmod
-u
$VTOY_PATH
/tool/
$vtKoName
$VTOY_PATH
/
$vtModName
$vtDebug
$VTOY_PATH
/tool/vtoykmod
-u
$VTOY_PATH
/tool/
$vtKoName
$VTOY_PATH
/
$vtModName
$vtDebug
#step2: fill parameters
#step2: fill parameters
vtPgsize
=
$(
$VTOY_PATH
/tool/vtoyksym
-p
)
vtPgsize
=
$(
$VTOY_PATH
/tool/vtoyksym
-p
)
vtlog
"
$VTOY_PATH
/tool/vtoykmod -f
$VTOY_PATH
/tool/
$vtKoName
$vtPgsize
0x
$printk_addr
0x
$ro_addr
0x
$rw_addr
$get_addr
$get_size
$put_addr
$put_size
0x
$kprobe_reg_addr
0x
$kprobe_unreg_addr
$vtDebug
"
$VTOY_PATH
/tool/vtoykmod
-f
$VTOY_PATH
/tool/
$vtKoName
$vtPgsize
0x
$printk_addr
0x
$ro_addr
0x
$rw_addr
$get_addr
$get_size
$put_addr
$put_size
0x
$kprobe_reg_addr
0x
$kprobe_unreg_addr
$vtDebug
$VTOY_PATH
/tool/vtoykmod
-f
$VTOY_PATH
/tool/
$vtKoName
$vtPgsize
0x
$printk_addr
0x
$ro_addr
0x
$rw_addr
$get_addr
$get_size
$put_addr
$put_size
0x
$kprobe_reg_addr
0x
$kprobe_unreg_addr
$vtDebug
$BUSYBOX_PATH
/insmod
$VTOY_PATH
/tool/
$vtKoName
$BUSYBOX_PATH
/insmod
$VTOY_PATH
/tool/
$vtKoName
...
...
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