Please ignore this eamil.
On Mon, Jan 04, 2021 at 09:56:02AM +0800, Wang Chenglong wrote:
[Why] add password file is easy to ignore.
Signed-off-by: Wang Chenglong 18509160991@163.com
.../README.md | 0 .../{docker-rootfs => docker2rootfs}/common | 43 ++++++++++--------- .../packages-to-install | 0 .../{docker-rootfs => docker2rootfs}/run | 0 .../setup-image | 0 5 files changed, 22 insertions(+), 21 deletions(-) rename container/{docker-rootfs => docker2rootfs}/README.md (100%) rename container/{docker-rootfs => docker2rootfs}/common (77%) rename container/{docker-rootfs => docker2rootfs}/packages-to-install (100%) rename container/{docker-rootfs => docker2rootfs}/run (100%) rename container/{docker-rootfs => docker2rootfs}/setup-image (100%)
diff --git a/container/docker-rootfs/README.md b/container/docker2rootfs/README.md similarity index 100% rename from container/docker-rootfs/README.md rename to container/docker2rootfs/README.md diff --git a/container/docker-rootfs/common b/container/docker2rootfs/common similarity index 77% rename from container/docker-rootfs/common rename to container/docker2rootfs/common index fe37da9..c7ae8f5 100755 --- a/container/docker-rootfs/common +++ b/container/docker2rootfs/common @@ -33,7 +33,8 @@ usage() dst_rootfs_new_abspath: destination absolute path to create for rootfs
Example:
./run /tmp/openEuler-docker/openEuler-docker.${aarch}.tar.xz /tmp/openeuler-rootfs/
./run /tmp/openEuler-docker/openEuler-docker.${aarch}.tar.xz /tmp/openeuler-rootfs/# Please ensure $HOME/.config/compass-ci/rootfs-passwd exists.}
@@ -100,26 +101,26 @@ cp_rootfs() }
create_get_initrd() {
echo "Creating initrd.lkp via container/dracut-initrd..."cd "$CCI_SRC/container/dracut-initrd" || {echo "Failed to change into $CCI_SRC/container/dracut-initrd"exit 6}./run "$ROOTFS_DIR/lib/modules/$ROOTFS_KERNEL"echo "Finding initrd.lkp under $ROOTFS_DIR/boot ..."cd "$ROOTFS_DIR" || {echo "Failed to change into dir \"$ROOTFS_DIR\""exit 7}local initrd_lkp=$(find ./boot -name "initramfs.lkp*") && export ROOTFS_INITRD_LKP=$initrd_lkp[ -f "$ROOTFS_INITRD_LKP" ] || {echo "Failed to generate \"$ROOTFS_INITRD_LKP\""exit 8}echo "initrd_lkp: $ROOTFS_INITRD_LKP"
- echo "Creating initrd.lkp via container/dracut-initrd..."
- cd "$CCI_SRC/container/dracut-initrd" || {
echo "Failed to change into $CCI_SRC/container/dracut-initrd"exit 6- }
- ./run "$ROOTFS_DIR/lib/modules/$ROOTFS_KERNEL"
- echo "Finding initrd.lkp under $ROOTFS_DIR/boot ..."
- cd "$ROOTFS_DIR" || {
echo "Failed to change into dir \"$ROOTFS_DIR\""exit 7- }
- local initrd_lkp=$(find ./boot -name "initramfs.lkp*") && export ROOTFS_INITRD_LKP=$initrd_lkp
- [ -f "$ROOTFS_INITRD_LKP" ] || {
echo "Failed to generate \"$ROOTFS_INITRD_LKP\""exit 8- }
- echo "initrd_lkp: $ROOTFS_INITRD_LKP"
}
get_rootfs_kernel() diff --git a/container/docker-rootfs/packages-to-install b/container/docker2rootfs/packages-to-install similarity index 100% rename from container/docker-rootfs/packages-to-install rename to container/docker2rootfs/packages-to-install diff --git a/container/docker-rootfs/run b/container/docker2rootfs/run similarity index 100% rename from container/docker-rootfs/run rename to container/docker2rootfs/run diff --git a/container/docker-rootfs/setup-image b/container/docker2rootfs/setup-image similarity index 100% rename from container/docker-rootfs/setup-image rename to container/docker2rootfs/setup-image -- 2.23.0