mirrors/libguestfs
1
0
Fork 0
mirror of https://github.com/libguestfs/libguestfs.git synced 2026-03-21 22:53:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix for changed selinux mountpoint

Browse Source 
http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=707217
This commit is contained in:
Hilko Bengen
2013-05-17 19:07:48 +02:00
committed by Richard W.M. Jones
parent 6e20440fb1
commit 72afcf450a
2 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
appliance/init
View File

@@ -80,7 +80,7 @@ else
fi
if grep -sq selinux=1 /proc/cmdline; then
mount -t selinuxfs none /selinux
mount -t selinuxfs none /sys/fs/selinux
fi
# Update the system clock.

7
daemon/command.c
View File

@@ -45,7 +45,7 @@ do_command (char *const *argv)
int r;
CLEANUP_FREE char *sysroot_dev = NULL, *sysroot_dev_pts = NULL,
*sysroot_proc = NULL, *sysroot_selinux = NULL, *sysroot_sys = NULL;
int dev_ok, dev_pts_ok, proc_ok, selinux_ok, sys_ok;
int dev_ok, dev_pts_ok, proc_ok, sys_ok;
/* We need a root filesystem mounted to do this. */
NEED_ROOT (, return NULL);
@@ -70,7 +70,7 @@ do_command (char *const *argv)
sysroot_dev = sysroot_path ("/dev");
sysroot_dev_pts = sysroot_path ("/dev/pts");
sysroot_proc = sysroot_path ("/proc");
sysroot_selinux = sysroot_path ("/selinux");
sysroot_selinux = sysroot_path ("/sys/fs/selinux");
sysroot_sys = sysroot_path ("/sys");
if (sysroot_dev == NULL || sysroot_dev_pts == NULL ||
@@ -86,8 +86,6 @@ do_command (char *const *argv)
dev_pts_ok = r != -1;
r = command (NULL, NULL, str_mount, "--bind", "/proc", sysroot_proc, NULL);
proc_ok = r != -1;
r = command (NULL, NULL, str_mount, "--bind", "/selinux", sysroot_selinux, NULL);
selinux_ok = r != -1;
r = command (NULL, NULL, str_mount, "--bind", "/sys", sysroot_sys, NULL);
sys_ok = r != -1;
@@ -96,7 +94,6 @@ do_command (char *const *argv)
CHROOT_OUT;
if (sys_ok) umount_ignore_fail (sysroot_sys);
if (selinux_ok) umount_ignore_fail (sysroot_selinux);
if (proc_ok) umount_ignore_fail (sysroot_proc);
if (dev_pts_ok) umount_ignore_fail (sysroot_dev_pts);
if (dev_ok) umount_ignore_fail (sysroot_dev);