From 79a87e4789beb151ed77b1cb93e5f0ecfaed2eef Mon Sep 17 00:00:00 2001 From: r00t Date: Mon, 3 Aug 2015 04:05:03 -0400 Subject: [PATCH 1/2] fixing some naming stuffz... --- extra/packages.both | 2 +- extra/packages.both.AUDITME | 313 +++++++++++++++++++++++++++++ extra/packages.both.AUDITME.broken | 29 +++ lib/01-mk.chroot.func.sh | 6 +- lib/08-will_it_blend.func.sh | 8 +- lib/11-mentos.func.sh | 8 +- 6 files changed, 354 insertions(+), 12 deletions(-) create mode 100644 extra/packages.both.AUDITME create mode 100644 extra/packages.both.AUDITME.broken diff --git a/extra/packages.both b/extra/packages.both index 8765f95..f2d77ba 100644 --- a/extra/packages.both +++ b/extra/packages.both @@ -3,7 +3,7 @@ abs acpi #acpidump -afflib +#afflib aircrack-ng apr apr-util diff --git a/extra/packages.both.AUDITME b/extra/packages.both.AUDITME new file mode 100644 index 0000000..8765f95 --- /dev/null +++ b/extra/packages.both.AUDITME @@ -0,0 +1,313 @@ +# You can include comments, such as this. AUR packages are allowed. +# We need to install all X drivers. +abs +acpi +#acpidump +afflib +aircrack-ng +apr +apr-util +arj +asciidoc +atop +autopsy +autossh +backuppc +#bacula ## TODO: grab all the bacula packages in here +beep +bin86 +bind-tools +binutils +bluez-utils +bonnie++ +boxbackup-client +boxbackup-server +bozocrack-git +bridge-utils +burp-backup-git +btrfs-progs +cabextract +cdrtools +cdw +cfv +chapcrack-git +chntpw +cifs-utils +ckermit +clamav +clonezilla +cmospwd +colordiff +cowpatty +cpio +cpuburn +cpupower +crackpkcs12 +#cryptcat +cryptsetup +csync2 +customizepkg-scripting +dar +dcfldd +ddrescue +dd_rescue +dd_rhelp +debianutils +debootstrap +dialog +diffutils +djohn +dmidecode +dnssec-anchors +dnstracer +#dnsutils #replaced by bind-tools, https://www.archlinux.org/packages/extra/x86_64/bind-tools/ +dos2unix +dropbear +dstat +dump +dumpet +duplicity +dvd+rw-tools +e2fsprogs +ecryptfs-utils +ed +elfutils +#elilo-efi +elinks +etc-update +ethtool +exfat-utils +ext3grep +extundelete +f2fs-tools +fang +fbset +fcgi +fcgiwrap +fcrackzip +fdupes +file +findmyhash +findutils +firefox +flac +flashrom +foremost +fsarchiver +fuse +gd +git +gnu-efi-libs +gnu-netcat +gpart +gparted +gperftools +gpm +gptfdisk +gst-libav +gst-plugins-ugly +hashcat +hddtemp +hdparm +hexcurse +hexedit +hfsprogs +hfsutils +htop +httping +hwdetect +hwinfo +hydra +idnkit +ifenslave +iftop +inetutils +iotop +iozone +ipcalc +iperf +iperf3 +ipsec-tools +iptraf-ng +irssi +iso-codes +isomaster +jasper +jfsutils +#john-mpi +john +keyutils +kismet-allplugins +lftp +links +#logkeys +logkeys-keymaps +lm_sensors +lrzsz +lshw +lsiutil +lsof +lsscsi +lxde +lynx +#lzip +macchanger +magicrescue +mbr +mbuffer +mcelog +md5deep +mdadm +mdcrack +megaraid-cli +memtester +mfoc +minicom +mondo +mtd-utils +mtr +mtree +#mtx +multipath-tools +myrescue +nbd +ncftp +ncompress +ncrack +net-snmp +netselect +nettle +networkmanager-pptp +nginx-devel +ngrep +nmap +nmon +ntfs-3g +ntfsfixboot +nwipe +obnam +open-iscsi +openipmi +ophcrack +os-prober +p7zip +pack +par2cmdline +partclone +partclone-utils +parted +partimage +pax-utils +pciutils +pcmciautils +pdfcrack +perf +php +php-fpm +php-gd +php-mcrypt +#phrasendrescher +pigz +pkgfile +pkgtools +ppp +pptpclient +prebootloader +procinfo-ng +procps-ng +progsreiserfs +psmisc +pwgen +pixz +pyrit-svn +python2-gnuplot +python2-pyx +rarcrack +rcracki_mt +rdiff-backup +read-edid +reaver-wps-fork-t6x-git +rename +rfkill +rp-pppoe +rpcbind +rpmextract +rp-pppoe +rsnapshot +rygel +safecopy +samba +scapy +screen +scrounge-ntfs +scrub +scsiadd +sdparm +setserial +sg3_utils +sharutils +sipcalc +sipcrack +smartmontools +smbclient +s-nail +socat +#star ## do people even USE tape packups anymore? +strace +stress +sucrack +symlinks +sysstat +tcpdump +tcpslice +tcptraceroute +testdisk +tftp-hpa +thin-provisioning-tools +thttpd +tmon +tmux +tre +truecrack-svn +truecrypt +tor +udftools +#udpcast +unace +unison +unrar +unshield +unzip +usb_modeswitch +usbip +usbutils +vim-a +vim-bufexplorer +vim-indent-object +vim-minibufexpl +vim-nerdtree +vim-syntastic +vim-workspace +vlc +vncrack +vnstat +vpnc +weplab +whdd +whois +wifite-mod-pixiewps-git +wipe +wireshark-cli +wpscrack +wput +x11vnc +xfburn +xfsdump +xfsprogs +xmlto +xorg +xorg-drivers +xorg-xinit +zerofree +zip +zsh diff --git a/extra/packages.both.AUDITME.broken b/extra/packages.both.AUDITME.broken new file mode 100644 index 0000000..1a0e4a8 --- /dev/null +++ b/extra/packages.both.AUDITME.broken @@ -0,0 +1,29 @@ +boxbackup-client +boxbackup-server +burp-backup-git +chapcrack-git +debianutils +djohn +fang +hexcurse +httping +iozone +kismet-allplugins +lxde +mbr +mbuffer +mdcrack +memtester +mondo +pack +pkgtools +rcracki_mt +scrounge-ntfs +sipcrack +sucrack +truecrack-svn +weplab +wifite-mod-pixiewps-git +wpscrack +xorg +xorg-drivers diff --git a/lib/01-mk.chroot.func.sh b/lib/01-mk.chroot.func.sh index ce03053..440706a 100755 --- a/lib/01-mk.chroot.func.sh +++ b/lib/01-mk.chroot.func.sh @@ -257,8 +257,8 @@ EOF for x in $(find ${i}/etc/ -type f -iname "*.pacorig");do mv -f ${x} ${x%%.pacorig} ; done set +e ${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-${PNAME} - cp -a ${i}/boot/initramfs-linux.img ${i}/boot/initramfs-linux-${PNAME}.img + cp -a ${i}/boot/vmlinuz-linux ${i}/boot/vmlinuz-linux-${DISTNAME} + cp -a ${i}/boot/initramfs-linux.img ${i}/boot/initramfs-linux-${DISTNAME}.img set -e 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... @@ -306,7 +306,7 @@ EOF set +e 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 - cp -a ${i}/boot/initramfs-linux.img ${i}/boot/initramfs-linux-${PNAME}.img + cp -a ${i}/boot/initramfs-linux.img ${i}/boot/initramfs-linux-${DISTNAME}.img set -e done diff --git a/lib/08-will_it_blend.func.sh b/lib/08-will_it_blend.func.sh index c4ae162..21d6ebb 100644 --- a/lib/08-will_it_blend.func.sh +++ b/lib/08-will_it_blend.func.sh @@ -78,10 +78,10 @@ function will_it_blend () { cp -af ${BASEDIR}/extra/${UXNAME}.png ${TEMPDIR}/. cp -af ${BASEDIR}/extra/${UXNAME}.png ${TFTPDIR}/. mkdir -p ${TEMPDIR}/boot - cp -af ${CHROOTDIR}/boot/initramfs-linux-${PNAME}.img ${TEMPDIR}/boot/${UXNAME}.${ARCHSUFFIX}.img - cp -af ${CHROOTDIR}/boot/vmlinuz-linux-${PNAME} ${TEMPDIR}/boot/${UXNAME}.${ARCHSUFFIX}.kern - cp -af ${CHROOTDIR}/boot/initramfs-linux-${PNAME}.img ${TFTPDIR}/${UXNAME}.${ARCHSUFFIX}.img - cp -af ${CHROOTDIR}/boot/vmlinuz-linux-${PNAME} ${TFTPDIR}/${UXNAME}.${ARCHSUFFIX}.kern + cp -af ${CHROOTDIR}/boot/initramfs-linux-${DISTNAME}.img ${TEMPDIR}/boot/${UXNAME}.${ARCHSUFFIX}.img + cp -af ${CHROOTDIR}/boot/vmlinuz-linux-${DISTNAME} ${TEMPDIR}/boot/${UXNAME}.${ARCHSUFFIX}.kern + cp -af ${CHROOTDIR}/boot/initramfs-linux-${DISTNAME}.img ${TFTPDIR}/${UXNAME}.${ARCHSUFFIX}.img + cp -af ${CHROOTDIR}/boot/vmlinuz-linux-${DISTNAME} ${TFTPDIR}/${UXNAME}.${ARCHSUFFIX}.kern cp -af ${ARCHBOOT}/* ${HTTPDIR}/${DISTNAME}/. chown -R ${HTTPUSR}:${HTTPGRP} ${HTTPDIR} chown ${TFTPUSR}:${TFTPGRP} ${TFTPDIR}/${UXNAME}.* diff --git a/lib/11-mentos.func.sh b/lib/11-mentos.func.sh index 8d979ba..6fcea51 100644 --- a/lib/11-mentos.func.sh +++ b/lib/11-mentos.func.sh @@ -22,7 +22,7 @@ function mentos { RACECAR_CHK="" fi - if [[ -n $(find ${BASEDIR}/extra/pre-build.d/ -type f -newer ${BASEDIR}/root.x86_64/boot/vmlinuz-linux-${PNAME}) ]]; + if [[ -n $(find ${BASEDIR}/extra/pre-build.d/ -type f -newer ${BASEDIR}/root.x86_64/boot/vmlinuz-linux-${DISTNAME}) ]]; then touch ${LOCKFILE} sleep 2 @@ -36,7 +36,7 @@ function mentos { for i in ${CHROOTDIR32} ${CHROOTDIR64}; do echo -n "...Packages installing/upgrading to ${i}..." - local INSTKERN=$(file ${i}/boot/vmlinuz-linux-${PNAME} | awk '{print $9}' | cut -f1 -d"-") + local INSTKERN=$(file ${i}/boot/vmlinuz-linux-${DISTNAME} | awk '{print $9}' | cut -f1 -d"-") local MIRROR=$(egrep '^Server' ${i}/etc/pacman.d/mirrorlist | head -n1 | sed -e 's/^Server\ =\ //g ; s#$repo.*#core/os/x86_64/#g') local NEWKERN=$(curl -s "${MIRROR}" | grep linux | awk '{print $3}' | cut -f2 -d\" | egrep '^linux-[0-9].*pkg.tar.xz$' | cut -f2 -d"-") @@ -45,8 +45,8 @@ function mentos { 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}/ bash -c "apacman --noconfirm --noedit --skipinteg -S --needed ${PKGLIST}" - cp -a ${i}/boot/vmlinuz-linux ${i}/boot/vmlinuz-linux-${PNAME} - cp -a ${i}/boot/initramfs-linux.img ${i}/boot/initramfs-linux-${PNAME}.img + cp -a ${i}/boot/vmlinuz-linux ${i}/boot/vmlinuz-linux-${DISTNAME} + cp -a ${i}/boot/initramfs-linux.img ${i}/boot/initramfs-linux-${DISTNAME}.img echo "Done." done From 65200c2a0019fd627d614e5bc1b19941b14b8fb2 Mon Sep 17 00:00:00 2001 From: r00t Date: Mon, 3 Aug 2015 11:18:33 -0400 Subject: [PATCH 2/2] fixing files --- lib/08-will_it_blend.func.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/08-will_it_blend.func.sh b/lib/08-will_it_blend.func.sh index 21d6ebb..266d042 100644 --- a/lib/08-will_it_blend.func.sh +++ b/lib/08-will_it_blend.func.sh @@ -75,6 +75,7 @@ function will_it_blend () { # and now we copy stuff into the live directories echo "[${ARCHSUFFIX}-bit] Copying files for PXE, and ISO building, please be patient." #rm -rf ${TEMPDIR}/* + cat ${BASEDIR}/extra/bdisk.png > ${BASEDIR}/extra/${UXNAME}.png cp -af ${BASEDIR}/extra/${UXNAME}.png ${TEMPDIR}/. cp -af ${BASEDIR}/extra/${UXNAME}.png ${TFTPDIR}/. mkdir -p ${TEMPDIR}/boot