r00t2
/
bdisk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Activity

updating package list, minor tweak to mk chroot

This commit is contained in:
brent s. 2016-09-26 05:06:04 -04:00
parent c418fca548
commit 6d9f24ee28
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
extra/packages.both
View File

@ -145,7 +145,7 @@ links
lm_sensors lm_sensors
lrzsz lrzsz
lshw lshw
#lsiutil # 404'ing on source url at the moment #lsiutil # giving intermittent errors when trying to fetch source
lsof lsof
lsscsi lsscsi
#lxde # apacman currently doesn't like package groups, so... #lxde # apacman currently doesn't like package groups, so...
@ -169,8 +169,8 @@ pcmanfm
lynx lynx
#lzip #lzip
macchanger macchanger
magicrescue #magicrescue # no longer maintained, upstream down
#mbr # doesn't seem to build anymore mbr
mbuffer mbuffer
mcelog mcelog
mdadm mdadm
@ -180,11 +180,10 @@ mdcrack
memtester memtester
mfoc mfoc
minicom minicom
#mondo #mondo # mindi-busybox fails to build 09.23.2016
mtd-utils mtd-utils
mtr mtr
mtree mtree
#mtx
multipath-tools multipath-tools
myrescue myrescue
nbd nbd
@ -224,7 +223,7 @@ php
php-fpm php-fpm
php-gd php-gd
php-mcrypt php-mcrypt
#phrasendrescher phrasendrescher
pigz pigz
pkgfile pkgfile
pkgtools pkgtools
@ -254,6 +253,7 @@ rsnapshot
rygel rygel
safecopy safecopy
samba samba
scalpel-git
scapy scapy
screen screen
scrounge-ntfs scrounge-ntfs

4
lib/01-mk.chroot.func.sh
View File

@ -261,7 +261,7 @@ EOF
set +e set +e
${CHROOTCMD} ${i}/ /usr/bin/bash -c "apacman --noconfirm --noedit --skipinteg -S --needed linux" >> "${LOGFILE}.${FUNCNAME}" 2>&1 ${CHROOTCMD} ${i}/ /usr/bin/bash -c "apacman --noconfirm --noedit --skipinteg -S --needed linux" >> "${LOGFILE}.${FUNCNAME}" 2>&1
cp -a ${i}/boot/vmlinuz-linux ${i}/boot/vmlinuz-linux-${DISTNAME} cp -a ${i}/boot/vmlinuz-linux ${i}/boot/vmlinuz-linux-${DISTNAME}
#cp -a ${i}/boot/initramfs-linux.img ${i}/boot/initramfs-linux-${DISTNAME}.img cp -af ${i}/boot/initramfs-linux.img ${i}/boot/initramfs-linux-${DISTNAME}.img
set -e set -e
for x in $(find ${i}/etc/ -type f -iname "*.pacorig");do mv -f ${x} ${x%%.pacorig} ; done for x in $(find ${i}/etc/ -type f -iname "*.pacorig");do mv -f ${x} ${x%%.pacorig} ; done
# Uncomment if you wish to use the mkpasswd binary from within the chroot... # Uncomment if you wish to use the mkpasswd binary from within the chroot...
@ -309,7 +309,7 @@ EOF
set +e set +e
for x in $(find ${i}/etc/ -type f -iname "*.pacorig");do mv -f ${x} ${x%.pacorig} ; done for x in $(find ${i}/etc/ -type f -iname "*.pacorig");do mv -f ${x} ${x%.pacorig} ; done
${CHROOTCMD} ${i}/ /usr/bin/bash -c "mkinitcpio -p linux" >> "${LOGFILE}.${FUNCNAME}" 2>&1 ${CHROOTCMD} ${i}/ /usr/bin/bash -c "mkinitcpio -p linux" >> "${LOGFILE}.${FUNCNAME}" 2>&1
cp -a ${i}/boot/initramfs-linux.img ${i}/boot/initramfs-linux-${DISTNAME}.img cp -af ${i}/boot/initramfs-linux.img ${i}/boot/initramfs-linux-${DISTNAME}.img
set -e set -e
done done

2
src/ipxe

@ -1 +1 @@
Subproject commit 3bb61c33c2d77ac9a1a512d809576f3444b6b1ed Subproject commit 827dd1bfee67daa683935ce65316f7e0f057fe1c