summaryrefslogtreecommitdiff
path: root/functions
diff options
context:
space:
mode:
authorDaniel Baumann <daniel@debian.org>2011-09-30 00:56:49 +0200
committerDaniel Baumann <daniel@debian.org>2011-09-30 00:56:49 +0200
commit96e86b96d8b0c38cfcbef4201c5de112030d0326 (patch)
tree0513043052e30d5fccd8679a94c5b85fe9332bdd /functions
parent6b8183c277c3306d3d497f0479fb0545b9d3d990 (diff)
downloadvyos-live-build-96e86b96d8b0c38cfcbef4201c5de112030d0326.tar.gz
vyos-live-build-96e86b96d8b0c38cfcbef4201c5de112030d0326.zip
Adding --system option to define the resulting image type to be a live system or a normal, non-live system.
Diffstat (limited to 'functions')
-rwxr-xr-xfunctions/defaults.sh23
1 files changed, 21 insertions, 2 deletions
diff --git a/functions/defaults.sh b/functions/defaults.sh
index ef218d142..f8a3df615 100755
--- a/functions/defaults.sh
+++ b/functions/defaults.sh
@@ -22,6 +22,9 @@ Set_defaults ()
export LB_BASE
fi
+ # Setting system type
+ LB_SYSTEM="${LB_MODE:-live}"
+
# Setting mode (currently: debian, emdebian, progress, ubuntu and kubuntu)
LB_MODE="${LB_MODE:-debian}"
@@ -170,7 +173,15 @@ Set_defaults ()
;;
*)
- LB_INITRAMFS="${LB_INITRAMFS:-auto}"
+ case "${LB_SYSTEM}" in
+ live)
+ LB_INITRAMFS="${LB_INITRAMFS:-auto}"
+ ;;
+
+ normal)
+ LB_INITRAMFS="${LB_INITRAMFS:-none}"
+ ;;
+ esac
;;
esac
@@ -187,7 +198,15 @@ Set_defaults ()
;;
*)
- LB_INITSYSTEM="${LB_INITSYSTEM:-sysvinit}"
+ case "${LB_SYSTEM}" in
+ live)
+ LB_INITSYSTEM="${LB_INITSYSTEM:-sysvinit}"
+ ;;
+
+ normal)
+ LB_INITSYSTEM="${LB_INITSYSTEM:-none}"
+ ;;
+ esac
;;
esac