diff options
| author | James Meyer <james.meyer@operamail.com> | 2013-01-10 22:12:48 (GMT) |
|---|---|---|
| committer | James Meyer <james.meyer@operamail.com> | 2013-01-10 22:13:00 (GMT) |
| commit | 412779a29d766cb2832380e550db490356b67569 (patch) | |
| tree | 82fc57e8944271b313b9e6eb582ce551feb2cf4c /templates | |
| parent | 8730ff5dfffcb615d4aeebbba08127f681fe2d93 (diff) | |
| parent | 25d0595ebdeb9426957445336170919d22344e4d (diff) | |
| download | linhes_dev-412779a29d766cb2832380e550db490356b67569.zip | |
Merge remote-tracking branch 'origin/testing' into testing
Diffstat (limited to 'templates')
| -rwxr-xr-x | templates/enter_dev_chroot.sh | 13 | ||||
| -rw-r--r-- | templates/pacman.conf.chroot | 4 |
2 files changed, 9 insertions, 8 deletions
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 = |