[SCM] live-config-staging branch, debian, updated. eeb06421aadeff1f1695b09ef03973526830131f
Richard Nelson
unixabg at gmail.com
Sun Nov 27 22:07:58 UTC 2011
The following commit has been merged in the debian branch:
commit eeb06421aadeff1f1695b09ef03973526830131f
Author: Richard Nelson <unixabg at gmail.com>
Date: Sun Nov 27 16:07:21 2011 -0600
Clean trailing whitespace on 900-virtualbox.
diff --git a/scripts/config/900-virtualbox b/scripts/config/900-virtualbox
index 5e32ea9..c0a5d0a 100755
--- a/scripts/config/900-virtualbox
+++ b/scripts/config/900-virtualbox
@@ -54,7 +54,7 @@ Configure_virtualbox ()
esac
done
- echo "Checking for a local scratch device."
+ echo "Checking for a local scratch device."
# Try to find a partition labeled virtualbox and if not then try first partition on first drive of the unit.
MOUNTDEV="$(blkid | grep virtualbox | awk -F: '{ print $1 }')"
@@ -66,28 +66,28 @@ Configure_virtualbox ()
echo "Potential scratch devices of: ${MOUNTDEV}"
- echo "Checking for clean scratch file system on ${MOUNTDEV}!"
+ echo "Checking for clean scratch file system on ${MOUNTDEV}!"
fsck -C -a ${MOUNTDEV}
# Check for the mount point directory and take correct action.
if [ -d '/virtualbox' ]
then
- echo "The /virtualbox directory exists and is where we will compose the operations for the image."
+ echo "The /virtualbox directory exists and is where we will compose the operations for the image."
else
- echo "Making the /virtualbox directory where we will compose the operations for the image."
+ echo "Making the /virtualbox directory where we will compose the operations for the image."
mkdir -p /virtualbox
fi
- echo "Attempting to mount local scratch device."
+ echo "Attempting to mount local scratch device."
mount -v ${MOUNTDEV} /virtualbox
- echo "Setting the session type with /var/cache/gdm/dmrc for gdm3."
+ echo "Setting the session type with /var/cache/gdm/dmrc for gdm3."
# Check for the mount point directory and take correct action.
if [ -d "/var/cache/gdm/${LIVE_USERNAME}" ]
then
- echo "The /var/cache/gdm/${LIVE_USERNAME} directory exists where we compose the dmrc."
+ echo "The /var/cache/gdm/${LIVE_USERNAME} directory exists where we compose the dmrc."
else
- echo "Making the /var/cache/gdm/${LIVE_USERNAME} directory where we compose the dmrc."
+ echo "Making the /var/cache/gdm/${LIVE_USERNAME} directory where we compose the dmrc."
mkdir -p "/var/cache/gdm/${LIVE_USERNAME}"
fi
@@ -96,7 +96,7 @@ cat > /var/cache/gdm/${LIVE_USERNAME}/dmrc << EOF
Session=virtualbox
EOF
- echo "Setting the PostSession Default for the gdm3 to shutdown when we end the VirtualBox stops."
+ echo "Setting the PostSession Default for the gdm3 to shutdown when we end the VirtualBox stops."
cat > /etc/gdm3/PostSession/Default << EOF
#!/bin/sh
@@ -105,7 +105,7 @@ rm -f /var/cache/gdm/${LIVE_USERNAME}/dmrc
/sbin/halt
EOF
- echo "Setting up the virtualbox.desktop option."
+ echo "Setting up the virtualbox.desktop option."
cat > /usr/share/xsessions/virtualbox.desktop << EOF
[Desktop Entry]
@@ -118,7 +118,7 @@ Icon=
Type=Application
EOF
- echo "Setup the vmwrapper which starts VirtualBox with a window manager."
+ echo "Setup the vmwrapper which starts VirtualBox with a window manager."
cat > /usr/bin/vmwrapper << EOF
#!/bin/sh
@@ -136,7 +136,7 @@ cat > /usr/bin/vmwrapper << EOF
/usr/lib/virtualbox/VirtualBox --startvm ${VDINAME}
EOF
- echo "Setting chmod on the vmwrapper."
+ echo "Setting chmod on the vmwrapper."
chmod 0755 /usr/bin/vmwrapper
########################################################################
@@ -158,19 +158,19 @@ EOF
if [ -f "${IMAGEPATH}/${VDINAME}/image-release" ]
then
. "${IMAGEPATH}/${VDINAME}/image-release"
- echo "Found image-release: ${CRELEASE} "
+ echo "Found image-release: ${CRELEASE} "
else
- echo "******* No image-release found to set the CRELEASE variable! *******"
+ echo "******* No image-release found to set the CRELEASE variable! *******"
CRELEASE="NONE"
fi
- echo "Preparing VirtualBox image version ${CRELEASE}"
+ echo "Preparing VirtualBox image version ${CRELEASE}"
- echo "Checking to see if scratch was requested at boot."
+ echo "Checking to see if scratch was requested at boot."
if [ "${ACTION}" = "scratch" ]
then
- echo "Scratching everything in scratch dir on the fly!"
+ echo "Scratching everything in scratch dir on the fly!"
# On VirtualBox remove a couple of directories.
rm -rf /virtualbox/Logs
rm -rf /virtualbox/Snapshots
@@ -178,18 +178,18 @@ EOF
rm -f /virtualbox/*.*
# Also now have to remove local-release.
rm -f /virtualbox/local-release
- echo "Scratching completed!"
+ echo "Scratching completed!"
fi
if [ -f /virtualbox/local-release ]
then
. /virtualbox/local-release
- echo "Found local-release: ${RELEASE} "
+ echo "Found local-release: ${RELEASE} "
if [ "${RELEASE}" != "${CRELEASE}" ]
then
- echo "Upgrading release from version ${RELEASE} to ${CRELEASE}."
- echo "We will take scratch actions."
+ echo "Upgrading release from version ${RELEASE} to ${CRELEASE}."
+ echo "We will take scratch actions."
# On VirtualBox remove a couple of directories.
rm -rf /virtualbox/Logs
@@ -198,31 +198,31 @@ EOF
rm -f /virtualbox/*.*
# Also now have to remove local-release.
rm -f /virtualbox/local-release
- echo "Scratching completed!"
+ echo "Scratching completed!"
echo RELEASE=\"${CRELEASE}\" > /virtualbox/local-release
- echo "Rsyncing in some stuff to /virtualbox."
+ echo "Rsyncing in some stuff to /virtualbox."
rsync --exclude ${VDINAME}.vdi -r ${IMAGEPATH}/${VDINAME}/ /virtualbox/
# Link in the big chunks.
ln -s ${IMAGEPATH}/${VDINAME}/${VDINAME}.vdi /virtualbox
else
- echo "Version match no scratch action taken!"
+ echo "Version match no scratch action taken!"
fi
else
- echo "Looks like an initial release setup for version ${CRELEASE}."
+ echo "Looks like an initial release setup for version ${CRELEASE}."
echo RELEASE=\"${CRELEASE}\" > /virtualbox/local-release
- echo "Rsyncing in some stuff to /virtualbox."
+ echo "Rsyncing in some stuff to /virtualbox."
rsync --exclude ${VDINAME}.vdi -r ${IMAGEPATH}/${VDINAME}/ /virtualbox/
# Link in the big chunks.
ln -s ${IMAGEPATH}/${VDINAME}/${VDINAME}.vdi /virtualbox
fi
- echo "Setting the permissions on the /virtualbox folder."
+ echo "Setting the permissions on the /virtualbox folder."
chown -R ${LIVE_USERNAME}:${LIVE_USERNAME} /virtualbox
- echo "Completed custom options for username = ${LIVE_USERNAME} !"
+ echo "Completed custom options for username = ${LIVE_USERNAME} !"
}
Virtualbox
--
live-config-staging
More information about the debian-live-changes
mailing list