From 0ec4b273af72b4723df8b4a4c9e76e52b14a7328 Mon Sep 17 00:00:00 2001 From: James Meyer Date: Sat, 27 Oct 2012 16:03:07 -0500 Subject: fixups for creating the chroot Signed-off-by: James Meyer --- build_tools/archiso/mythvantage/build.sh | 3 ++- templates/enter_dev_chroot.sh | 13 +++++++------ templates/pacman.conf.chroot | 4 ++-- 3 files changed, 11 insertions(+), 9 deletions(-) diff --git a/build_tools/archiso/mythvantage/build.sh b/build_tools/archiso/mythvantage/build.sh index bf8e2ea..46d35f7 100755 --- a/build_tools/archiso/mythvantage/build.sh +++ b/build_tools/archiso/mythvantage/build.sh @@ -222,7 +222,8 @@ make_customize_root_image() { if [[ ! -e ${work_dir}/build.${FUNCNAME} ]]; then cp -af ${script_path}/root-image ${work_dir} chmod 750 ${work_dir}/root-image/etc/sudoers.d - chmod 440 ${work_dir}/root-image/etc/sudoers.d/g_wheel + #JM + #chmod 440 ${work_dir}/root-image/etc/sudoers.d/g_wheel mkdir -p ${work_dir}/root-image/etc/pacman.d #JM #mkdir -p ${work_dir}/storage/data/home diff --git a/templates/enter_dev_chroot.sh b/templates/enter_dev_chroot.sh index 9eda528..b3c27d6 100755 --- a/templates/enter_dev_chroot.sh +++ b/templates/enter_dev_chroot.sh @@ -61,7 +61,7 @@ cleanUp() { # no arguments # unmount all: local mnts1="data/$repoBaseDir data/$packageDir build_tools" - local mnts2="dev/pts sys proc" + local mnts2=" dev dev/pts sys proc" for i in $mnts1 $mnts2 ; do grep -q $BROOT/$i /proc/mounts && { echo -e "unMounting ${C_B}$i${C_N}" @@ -123,12 +123,13 @@ trap cleanUp 1 2 15 EXIT ckMount -t proc proc ckMount -t sysfs sys -ckMount -t devpts dev/pts +mount --bind /dev $BROOT/dev +#ckMount -t devpts dev/pts -[ -e dev/random ] || mknod dev/random c 1 8 -[ -e dev/urandom ] || mknod dev/urandom c 1 9 -[ -e dev/tty ] || mknod dev/tty c 5 0 -[ -e dev/ptmx ] || mknod dev/ptmx c 5 2 +#[ -e dev/random ] || mknod dev/random c 1 8 +#[ -e dev/urandom ] || mknod dev/urandom c 1 9 +#[ -e dev/tty ] || mknod dev/tty c 5 0 +#[ -e dev/ptmx ] || mknod dev/ptmx c 5 2 ckMount --bind $toolsDir/build_tools build_tools ckMount --bind $packageDir data/$packageDir diff --git a/templates/pacman.conf.chroot b/templates/pacman.conf.chroot index 0ab10ba..232ccee 100644 --- a/templates/pacman.conf.chroot +++ b/templates/pacman.conf.chroot @@ -19,7 +19,7 @@ # If you wish to use different paths, uncomment and update the paths. #RootDir = / #DBPath = /var/lib/pacman/ -CacheDir = /data/var/cache/pacman/pkg/ +CacheDir = /tmp/cache/pacman #LogFile = /var/log/pacman.log HoldPkg = pacman glibc # If upgrades are available for these packages they will be asked for first @@ -27,7 +27,7 @@ SyncFirst = pacman #XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u #XferCommand = /usr/bin/curl -C - -f %u > %o #CleanMethod = KeepInstalled -Architecture = i686 +Architecture = REPLACEME # Pacman won't upgrade packages listed in IgnorePkg and members of IgnoreGroup #IgnorePkg = -- cgit v0.12