|
@@ -710,7 +710,7 @@ umount_filesystems() {
|
|
copy_rootfs() {
|
|
copy_rootfs() {
|
|
DIALOG --title "Check /dev/tty7 for details" \
|
|
DIALOG --title "Check /dev/tty7 for details" \
|
|
--infobox "Copyring live image to target rootfs, please wait ..." 4 60
|
|
--infobox "Copyring live image to target rootfs, please wait ..." 4 60
|
|
- LANG=C cp -axvn / $TARGETDIR >$LOG 2>&1
|
|
|
|
|
|
+ LANG=C cp -axvnu / $TARGETDIR >$LOG 2>&1
|
|
if [ $? -ne 0 ]; then
|
|
if [ $? -ne 0 ]; then
|
|
DIE 1
|
|
DIE 1
|
|
fi
|
|
fi
|
|
@@ -765,9 +765,6 @@ ${BOLD}Do you want to continue?${RESET}" 20 80 || return
|
|
# Create and mount filesystems
|
|
# Create and mount filesystems
|
|
create_filesystems
|
|
create_filesystems
|
|
|
|
|
|
- # mount required fs
|
|
|
|
- mount_filesystems
|
|
|
|
-
|
|
|
|
# If source not set use defaults.
|
|
# If source not set use defaults.
|
|
if [ "$(get_option SOURCE)" = "local" -o -z "$SOURCE_DONE" ]; then
|
|
if [ "$(get_option SOURCE)" = "local" -o -z "$SOURCE_DONE" ]; then
|
|
copy_rootfs
|
|
copy_rootfs
|
|
@@ -786,10 +783,15 @@ ${BOLD}Do you want to continue?${RESET}" 20 80 || return
|
|
echo "Removing temporaray packages from target ..." >$LOG
|
|
echo "Removing temporaray packages from target ..." >$LOG
|
|
xbps-remove -r $TARGETDIR -Ry dialog f2fs-tools >>$LOG 2>&1
|
|
xbps-remove -r $TARGETDIR -Ry dialog f2fs-tools >>$LOG 2>&1
|
|
rmdir $TARGETDIR/mnt/target
|
|
rmdir $TARGETDIR/mnt/target
|
|
|
|
+ # mount required fs
|
|
|
|
+ mount_filesystems
|
|
else
|
|
else
|
|
|
|
+ # mount required fs
|
|
|
|
+ mount_filesystems
|
|
# network install, use packages.
|
|
# network install, use packages.
|
|
install_packages
|
|
install_packages
|
|
fi
|
|
fi
|
|
|
|
+
|
|
DIALOG --infobox "Applying installer settings..." 4 60
|
|
DIALOG --infobox "Applying installer settings..." 4 60
|
|
|
|
|
|
# copy target fstab.
|
|
# copy target fstab.
|