summaryrefslogtreecommitdiff
path: root/scripts/live
diff options
context:
space:
mode:
authorDaniel Baumann <daniel@debian.org>2007-10-19 19:21:42 +0200
committerDaniel Baumann <daniel@debian.org>2011-03-09 17:31:06 +0100
commite5ed5f84c8dff7855284b6d37f14da6a2e85f1c5 (patch)
tree733883143e7d99ef1c0902874078dc4ba071c086 /scripts/live
parent6bfe95a7c93d84d0a2f9071bbe3809c173287402 (diff)
downloadlive-boot-e5ed5f84c8dff7855284b6d37f14da6a2e85f1c5.tar.gz
live-boot-e5ed5f84c8dff7855284b6d37f14da6a2e85f1c5.zip
Removing ubuntu support.
Diffstat (limited to 'scripts/live')
-rwxr-xr-xscripts/live11
1 files changed, 5 insertions, 6 deletions
diff --git a/scripts/live b/scripts/live
index 27221ef..b4254e1 100755
--- a/scripts/live
+++ b/scripts/live
@@ -18,12 +18,11 @@ home_snapshot_label="home-sn"
USERNAME="user"
USERFULLNAME="Live user"
HOSTNAME="host"
-BUILD_SYSTEM="Custom"
mkdir -p "${mountpoint}"
[ -f /etc/live.conf ] && . /etc/live.conf
-export USERNAME USERFULLNAME HOSTNAME BUILD_SYSTEM
+export USERNAME USERFULLNAME HOSTNAME
. /scripts/live-helpers
@@ -618,7 +617,7 @@ do_netmount ()
{
rc=1
- modprobe "${MP_QUIET}" af_packet # For DHCP
+ modprobe -q af_packet # For DHCP
udevtrigger
udevsettle
@@ -688,7 +687,7 @@ do_nfsmount ()
{
rc=1
- modprobe "${MP_QUIET}" nfs
+ modprobe -q nfs
if [ -z "${NFSOPTS}" ]
then
@@ -721,7 +720,7 @@ do_cifsmount ()
fi
[ "${quiet}" != "y" ] && log_begin_msg "Trying mount.cifs ${NFSROOT} ${mountpoint} ${CIFSOPTS}"
- modprobe "${MP_QUIET}" cifs
+ modprobe -q cifs
if mount.cifs "${NFSROOT}" "${mountpoint}" "${CIFSOPTS}"
then
@@ -861,7 +860,7 @@ setup_unionfs ()
image_directory="${1}"
rootmnt="${2}"
- modprobe "${MP_QUIET}" -b ${UNIONTYPE}
+ modprobe -q -b ${UNIONTYPE}
# run-init can't deal with images in a subdir, but we're going to
# move all of these away before it runs anyway. No, we're not,