From 5590208885cc9733cf0e9209dc6a91a6e746e0bf Mon Sep 17 00:00:00 2001 From: longpanda Date: Sat, 8 Oct 2022 10:07:39 +0800 Subject: [PATCH] Fix the issue that rockcluster, part of config missing during install. (#1900) --- IMG/cpio/ventoy/hook/openEuler/ventoy-inotifyd-hook.sh | 3 +++ IMG/cpio/ventoy/hook/openEuler/ventoy-timeout.sh | 3 +++ IMG/cpio/ventoy/hook/rhel7/ventoy-inotifyd-hook.sh | 3 +++ IMG/cpio/ventoy/hook/rhel7/ventoy-timeout.sh | 3 +++ 4 files changed, 12 insertions(+) diff --git a/IMG/cpio/ventoy/hook/openEuler/ventoy-inotifyd-hook.sh b/IMG/cpio/ventoy/hook/openEuler/ventoy-inotifyd-hook.sh index e0a9a0bb..afbaec75 100644 --- a/IMG/cpio/ventoy/hook/openEuler/ventoy-inotifyd-hook.sh +++ b/IMG/cpio/ventoy/hook/openEuler/ventoy-inotifyd-hook.sh @@ -51,6 +51,9 @@ if is_inotify_ventoy_part $3; then if [ -e /sbin/anaconda-diskroot ]; then vtlog "set anaconda-diskroot ..." + + #busybox cp doesn't support -t option (issue 1900) + /bin/cp -a /bin/cp $BUSYBOX_PATH/cp /sbin/anaconda-diskroot /dev/ventoy fi diff --git a/IMG/cpio/ventoy/hook/openEuler/ventoy-timeout.sh b/IMG/cpio/ventoy/hook/openEuler/ventoy-timeout.sh index e0ca553c..cfd339f7 100644 --- a/IMG/cpio/ventoy/hook/openEuler/ventoy-timeout.sh +++ b/IMG/cpio/ventoy/hook/openEuler/ventoy-timeout.sh @@ -39,6 +39,9 @@ fi if [ -e /sbin/anaconda-diskroot ]; then vtlog "set anaconda-diskroot /dev/ventoy ..." + + #busybox cp doesn't support -t option (issue 1900) + /bin/cp -a /bin/cp $BUSYBOX_PATH/cp /sbin/anaconda-diskroot /dev/ventoy fi diff --git a/IMG/cpio/ventoy/hook/rhel7/ventoy-inotifyd-hook.sh b/IMG/cpio/ventoy/hook/rhel7/ventoy-inotifyd-hook.sh index 3960315c..96052b7c 100644 --- a/IMG/cpio/ventoy/hook/rhel7/ventoy-inotifyd-hook.sh +++ b/IMG/cpio/ventoy/hook/rhel7/ventoy-inotifyd-hook.sh @@ -70,6 +70,9 @@ if is_inotify_ventoy_part $3; then if [ -e /sbin/anaconda-diskroot ]; then vtlog "set anaconda-diskroot ..." + + #busybox cp doesn't support -t option (issue 1900) + /bin/cp -a /bin/cp $BUSYBOX_PATH/cp /sbin/anaconda-diskroot /dev/ventoy fi diff --git a/IMG/cpio/ventoy/hook/rhel7/ventoy-timeout.sh b/IMG/cpio/ventoy/hook/rhel7/ventoy-timeout.sh index e0ca553c..cfd339f7 100644 --- a/IMG/cpio/ventoy/hook/rhel7/ventoy-timeout.sh +++ b/IMG/cpio/ventoy/hook/rhel7/ventoy-timeout.sh @@ -39,6 +39,9 @@ fi if [ -e /sbin/anaconda-diskroot ]; then vtlog "set anaconda-diskroot /dev/ventoy ..." + + #busybox cp doesn't support -t option (issue 1900) + /bin/cp -a /bin/cp $BUSYBOX_PATH/cp /sbin/anaconda-diskroot /dev/ventoy fi