summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKim Hagen <kim.sidney@gmail.com>2016-02-01 14:05:09 -0500
committerKim Hagen <kim.sidney@gmail.com>2016-02-01 14:05:09 -0500
commit775b3ace1c12328a993367cece20373de7f645da (patch)
tree81f1ec1dc5a925bc6e0ae0ad26d3594c7b53f60b
parentd35d8d1f937cbf764c67c2fc23b8dbaf18707984 (diff)
downloadlive-boot-775b3ace1c12328a993367cece20373de7f645da.tar.gz
live-boot-775b3ace1c12328a993367cece20373de7f645da.zip
Do not generate error is folders exist.
-rwxr-xr-xcomponents/9990-main.sh1
-rwxr-xr-xcomponents/9990-misc-helpers.sh4
2 files changed, 3 insertions, 2 deletions
diff --git a/components/9990-main.sh b/components/9990-main.sh
index b324fde..bbf0f10 100755
--- a/components/9990-main.sh
+++ b/components/9990-main.sh
@@ -191,6 +191,7 @@ Live ()
Netbase
Swap
+
Vyos
exec 1>&6 6>&-
diff --git a/components/9990-misc-helpers.sh b/components/9990-misc-helpers.sh
index fe96387..44381d9 100755
--- a/components/9990-misc-helpers.sh
+++ b/components/9990-misc-helpers.sh
@@ -1317,8 +1317,8 @@ do_union ()
# + a workdir to become mounted
# + workdir and upperdir to reside under the same mount
# + workdir and upperdir to be in separate directories
- mkdir "${unionrw}/rw"
- mkdir "${unionrw}/work"
+ mkdir -p "${unionrw}/rw"
+ mkdir -p "${unionrw}/work"
unionmountopts="-o noatime,lowerdir=${unionro},upperdir=${unionrw}/rw,workdir=${unionrw}/work"
;;
esac