Commit e422a68c authored by Daniel Baumann's avatar Daniel Baumann
Browse files

Adding upstream version 4.0~alpha27.

parent cfcdd3e6
......@@ -14,7 +14,7 @@ set -e
[ -e "${LIVE_BUILD}/scripts/build.sh" ] && . "${LIVE_BUILD}/scripts/build.sh" || . /usr/lib/live/build.sh
# Setting static variables
DESCRIPTION="$(Echo 'mount /selinux')"
DESCRIPTION="$(Echo 'mount /sys/fs/selinux')"
HELP=""
USAGE="${PROGRAM} {install|remove} [--force]"
......@@ -32,9 +32,9 @@ Require_stagefile .build/config .build/bootstrap
case "${1}" in
install)
if [ -e /selinux/enforce ] && [ "$(cat /selinux/enforce)" = "1" ]
if [ -e /sys/fs/selinux/enforce ] && [ "$(cat /sys/fs/selinux/enforce)" = "1" ]
then
Echo_message "Begin mounting /selinux..."
Echo_message "Begin mounting /sys/fs/selinux..."
# Checking stage file
Check_stagefile .build/chroot_selinuxfs
......@@ -46,10 +46,10 @@ case "${1}" in
Create_lockfile .lock
# Create mountpoint
mkdir -p chroot/selinux
mkdir -p chroot/sys/fs/selinux
# Mounting /selinux
mount selinuxfs-live -t selinuxfs chroot/selinux
# Mounting /sys/fs/selinux
mount selinuxfs-live -t selinuxfs chroot/sys/fs/selinux
# Creating stage file
Create_stagefile .build/chroot_selinuxfs
......@@ -57,7 +57,7 @@ case "${1}" in
;;
remove)
Echo_message "Begin unmounting /selinux..."
Echo_message "Begin unmounting /sys/fs/selinux..."
# Checking lock file
Check_lockfile .lock
......@@ -65,10 +65,10 @@ case "${1}" in
# Creating lock file
Create_lockfile .lock
# Unmounting /selinux
if [ -e chroot/selinux/enforce ]
# Unmounting /sys/fs/selinux
if [ -e chroot/sys/fs/selinux/enforce ]
then
umount chroot/selinux
umount chroot/sys/fs/selinux
fi
# Removing stage file
......
......@@ -1364,10 +1364,18 @@ then
rmdir --ignore-fail-on-non-empty local > /dev/null 2>&1 || true
fi
# New style configuration
Echo_warning "WARNING: THIS VERSION OF LIVE-BUILD IS EXPERIMENTAL!"
Echo_warning "IT IS UNFINISHED AND CHANGES HEAVILY WITHOUT PRIOR NOTICE."
Echo_warning "USER DISCRETION IS ADVISED."
if echo "${VERSION}" | grep -qs "alpha"
then
# live-build alpha version
Echo_warning "WARNING: THIS VERSION OF LIVE-BUILD IS EXPERIMENTAL!"
Echo_warning "IT IS UNFINISHED AND CHANGES HEAVILY WITHOUT PRIOR NOTICE."
Echo_warning "USER DISCRETION IS ADVISED."
Echo_warning ""
Echo_warning "Please also note that you are running a live-build development version"
Echo_warning "and that we are only supporting the newest development version."
Echo_warning ""
Echo_warning "Make sure you are using the newest version at all times."
fi
cat > config/build << EOF
[Image]
......
......@@ -96,7 +96,7 @@ esac
Echo_warning "!!! The following error/warning messages can be ignored !!!"
Losetup $FREELO ${LIVE_IMAGE_NAME}-source.img 0
Chroot chroot "parted -s ${FREELO} mklabel msdos" || true
Chroot chroot "parted -s ${FREELO} mkpart primary ${PARTITION_TYPE} 0.0 100%" || true
Chroot chroot "parted -a optimal -s ${FREELO} mkpart primary ${PARTITION_TYPE} 0.0 100%" || true
Lodetach ${FREELO}
Losetup $FREELO ${LIVE_IMAGE_NAME}-source.img 1
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment