diff options
Diffstat (limited to 'abs')
-rwxr-xr-x | abs/core-testing/LinHES-config/PKGBUILD | 43 | ||||
-rw-r--r-- | abs/core-testing/diskless-legacy/PKGBUILD | 16 | ||||
-rwxr-xr-x | abs/core-testing/diskless-legacy/config_diskless_frontend.bash (renamed from abs/core-testing/LinHES-config/config_diskless_frontend.bash) | 58 |
3 files changed, 95 insertions, 22 deletions
diff --git a/abs/core-testing/LinHES-config/PKGBUILD b/abs/core-testing/LinHES-config/PKGBUILD index 27e5526..2998dfc 100755 --- a/abs/core-testing/LinHES-config/PKGBUILD +++ b/abs/core-testing/LinHES-config/PKGBUILD @@ -1,12 +1,14 @@ pkgname=LinHES-config pkgver=2.0 -pkgrel=27 +pkgrel=28 conflicts=(MythVantage-config MythVantage-config-dev LinHES-config-dev ) pkgdesc="Install and configure your system" depends=(bc libstatgrab mysql-python expect curl dnsutils parted sg3_utils nmbscan system-templates rsync python-parted ddcxinfo) arch=('i686') -source=(mv_install.py mv_config.py mythinstall.bin myth_user_call file_time_offset.py install-ui.xml install_proxy.sh install_functions.sh systemconfig.sh install_db_chroot.sh restore_default_settings.sh xconfig.sh timezip.py soundconfig.sh LinHES-release issue MythVantage.sh create_master.sh build_diskless.sh networkconfig.sh timezone.bin autocard.py restore_km_db_chroot.sh README mv_advanced.py mv_common.py mv_ir.py mv_misc.py mv_network.py mv_screensaver.py mv_smolt.py mv_software.py mv_webuser.py mv_hostype.py systemconfig.py) +source=(mv_install.py mv_config.py +#mythinstall.bin +myth_user_call file_time_offset.py install-ui.xml install_proxy.sh install_functions.sh systemconfig.sh install_db_chroot.sh restore_default_settings.sh xconfig.sh timezip.py soundconfig.sh LinHES-release issue MythVantage.sh create_master.sh build_diskless.sh networkconfig.sh timezone.bin autocard.py restore_km_db_chroot.sh README mv_advanced.py mv_common.py mv_ir.py mv_misc.py mv_network.py mv_screensaver.py mv_smolt.py mv_software.py mv_webuser.py mv_hostype.py systemconfig.py) install=LinHES.install build() { @@ -48,7 +50,6 @@ build() { install -m 0755 mv_webuser.py $MVDIR/bin/ install -m 0755 mv_hostype.py $MVDIR/bin/ install -m 0755 systemconfig.py $MVDIR/bin/ - install -m 0755 config_diskless_frontend.bash $MVDIR/bin/ #README file displayed on install install -m 0755 README $MVDIR/README @@ -64,10 +65,44 @@ build() { install -m 0755 install-ui.xml $startdir/pkg/usr/share/mythtv/themes/default/ #copy in the binaries - install -m 4755 mythinstall.bin $MVDIR/bin/MythVantage +# install -m 4755 mythinstall.bin $MVDIR/bin/MythVantage cd $MVDIR/bin ln -s MythVantage mythvantage ln -s MythVantage mythinstall cd - } +md5sums=('97a75e1c2d780881566d3388532ac0f7' + '40e3173b3f98beb1d94320eef3b60854' + 'e36da536dd651ef182e7642337889e77' + '3baa23764e1b6bcb2d66d7d859096940' + 'd6009f9a4ff3238aa911d6e61a8c675a' + 'd7a8cd4a0060399ae22e69f74e04eb07' + '0abe8d207147eeb306743640e33e4757' + 'f88d2fb88339a4bf8ec9217a3fbcdef7' + '8ac1cfd2eca0f641737da0d0aca416a7' + 'd8a4a1699e04eed9ee69d58616069f33' + '3a91b587179be4fecb2549e46821708e' + 'a02a7c0c59a1cc96d88137a41354c96a' + 'e459ed069317bccb20351f037a9df3d2' + 'd092238975aafaac4ec576d34303f762' + '6aff504ed5e860adc1b7317cd0780900' + '55fccb1da0417a896b724f7cfc32dd5a' + 'ab2aa42c2947148c2b1cac0ade6d1d55' + 'd429b59d3cfb37b0624c6a4a71a7c2c0' + 'a225143e3df6f56d451c2875e54ddbae' + '1ee558ee9efec54016cb4c87c61e569c' + '687555968d4ca688d8f95c8f13e1d8d4' + '3d1e4a119f38cff0498bf8a67e94e4b3' + 'e9cfd0ccad3a984520780947b2f420bd' + '5ad4a57fe6bd53ea6a5820751c476e4d' + 'cf0113438a4916a8d815a3b7bde50c42' + '4aa795a1f5d789d5532a752606eca4df' + '65d93f15ac85adf8299552581789a731' + 'a6c9cd6cf243daea737e4ed601c88567' + '32385482ecc1275409b71f08d8b03acc' + 'da0a2fb1e3cdbabac1f62e8b908c5d7f' + '30e527552ae86eb90d5c2169c6316fd1' + 'f19917bed3a1e00cbe08838bee18b4b7' + '08282647ebf7e563cb9f3bc2ad8aee14' + 'd53f305749abdf5fca176f50b40df4fc') diff --git a/abs/core-testing/diskless-legacy/PKGBUILD b/abs/core-testing/diskless-legacy/PKGBUILD new file mode 100644 index 0000000..6b7cea7 --- /dev/null +++ b/abs/core-testing/diskless-legacy/PKGBUILD @@ -0,0 +1,16 @@ +# $Id: PKGBUILD 23123 2009-01-03 02:43:02Z kevin $ +# Maintainer: Greg Frost <gregfrost1@bigpond.com> +pkgname=diskless-legacy +pkgver=1 +pkgrel=1 +pkgdesc="Script for configuring a diskless mythtv frontends using NFS root." +arch=i686 +depends=(tftp-hpa dhcp) +source=(config_diskless_frontend.bash) +md5sums=('825fbc61ef209dc47f17dbaab5829779') + +build() { + install -D -m755 ${srcdir}/config_diskless_frontend.bash \ + ${pkgdir}/usr/local/bin/config_diskless_frontend.bash +} +md5sums=('825fbc61ef209dc47f17dbaab5829779') diff --git a/abs/core-testing/LinHES-config/config_diskless_frontend.bash b/abs/core-testing/diskless-legacy/config_diskless_frontend.bash index 21bf8a0..ffd1afd 100755 --- a/abs/core-testing/LinHES-config/config_diskless_frontend.bash +++ b/abs/core-testing/diskless-legacy/config_diskless_frontend.bash @@ -2,8 +2,25 @@ # This script configures your backend so that a diskless # frontend can boot from it. -source /usr/local/bin/linhes_functions.bash +function backtitle() { # no arguments. + BT="${0##*/}" + KMV_F1='/KNOPPIX/KnoppMyth-version' + KMV_F2='/etc/LinHES-release' + if [ -f "$KMV_F1" ]; then + BT="-= $(cat $KMV_F1) $BT =-" + elif [ -f "$KMV_F2" ]; then + BT="-= $(cat $KMV_F2) $BT =-" + fi +} + +function must_be_root() { # no arguments. + test $(id -u) == 0 && return + MSG="\Z1ERROR\Zn: This script \Z4should\Zn be run by \Z1root\Zn." + dialog --backtitle "$BT" --colors --msgbox "$MSG" 5 45 + exit 4 +} +backtitle must_be_root TITLE="Diskless FE Configuration" @@ -330,8 +347,8 @@ enable_mysql_and_backend_networking() { /sbin/sv stop mythbackend - if grep -q ^bind-address /etc/my.cnf ; then - echo "Commenting out bind-address." + if grep -q ^skip-networking /etc/my.cnf ; then + echo "Commenting out skip-networking." cp /etc/my.cnf /etc/my.cnf~ cat /etc/my.cnf~ | sed 's/^skip-networking/#skip-networking/g' > \ /etc/my.cnf @@ -353,14 +370,21 @@ UPDATE settings SET data='$BACKEND_IP' WHERE value='MasterServerIP';" | /sbin/sv start mythbackend } -export_usr() { - # Ensure that the /usr directory is read-only exported. +export_mounts() { + # Ensure that the /myth directory is exported. - if ! grep -q ^/usr[[:space:]] /etc/exports ; then - echo "Adding line for /usr in /etc/exports" - echo "/usr *(ro,async,no_subtree_check)" >> /etc/exports + if ! grep -q ^/myth[[:space:]] /etc/exports ; then + echo "Adding line for /myth in /etc/exports" + echo "/myth *(rw,async,no_subtree_check)" >> /etc/exports else - echo "Already added line for /usr in /etc/exports" + echo "Already added line for /myth in /etc/exports" + fi + + if ! grep -q ^/data/var/cache/pacman[[:space:]] /etc/exports ; then + echo "Adding line for /data/var/cache/pacman in /etc/exports" + echo "/data/var/cache/pacman *(rw,async,no_subtree_check)" >> /etc/exports + else + echo "Already added line for /data/var/cache/pacman in /etc/exports" fi } @@ -372,8 +396,7 @@ enable_nfs() { } restart_nfs (){ - - /usr/sbin/exportfs -r + /usr/sbin/exportfs -arv } export_nfsroot() { @@ -468,7 +491,7 @@ create_new_nfsroot() { "$DIR" != /sbin && \ "$DIR" != /tmp && \ "$DIR" != /data && \ - "$DIR" != /usr && \ + "$DIR" != /media && \ "$DIR" != /proc && \ "$DIR" != /sys && \ "$DIR" != /storage && \ @@ -496,13 +519,13 @@ create_new_nfsroot() { --exclude=/var/lib/named \ 2> /dev/null | tar x 2> /dev/null - for DIR in /myth /mnt /tmp /usr /proc /sys /cdrom /var/lib/mlocate ; do + for DIR in /myth /mnt /data /tmp /proc /media /sys /cdrom /var/lib/mlocate ; do echo " Creating $DIR" tar c $DIR --exclude=$DIR/* 2> /dev/null | tar x 2> /dev/null done + mkdir -p $NFSROOT/data/var/cache/pacman -# chroot $NFSROOT mount -t nfs localhost:/usr /usr chroot $NFSROOT /sbin/remove_service.sh dhcpd chroot $NFSROOT /sbin/remove_service.sh lighttpd chroot $NFSROOT /sbin/remove_service.sh mysql @@ -511,7 +534,6 @@ create_new_nfsroot() { chroot $NFSROOT /sbin/remove_service.sh nmbd chroot $NFSROOT /sbin/remove_service.sh smbd chroot $NFSROOT /sbin/remove_service.sh tftpd -# chroot $NFSROOT umount /usr # Update the fstab. @@ -521,8 +543,8 @@ create_new_nfsroot() { echo "\ $BACKEND_IP:/nfsroot / nfs defaults,nolock,auto,noatime 0 2 -$BACKEND_IP:/usr /usr nfs defaults,nolock,auto,noatime 0 2 $BACKEND_IP:/myth /myth nfs defaults,nolock,auto,noatime 0 0 +$BACKEND_IP:/data/var/cache/pacman /data/var/cache/pacman nfs defaults,nolock,auto,noatime 0 0 " >> $NFSROOT/etc/fstab cp $NFSROOT/etc/rc.sysinit $NFSROOT/etc/rc.sysinit~ @@ -590,11 +612,11 @@ get_network_info setup_tftpd setup_dhcpd enable_mysql_and_backend_networking -export_usr +export_mounts create_tftpboot_directory enable_nfs -# Restart nfs so that the newly exported /usr directory can be mounted. This +# Restart nfs to ensure that the exported /myth directory can be mounted. This # is required to create a new frontend. restart_nfs |