diff options
13 files changed, 315 insertions, 10 deletions
diff --git a/build_tools/archiso/archiso/archiso_shutdown b/build_tools/archiso/archiso/archiso_shutdown index 85cce59..e61b7f9 100644 --- a/build_tools/archiso/archiso/archiso_shutdown +++ b/build_tools/archiso/archiso/archiso_shutdown @@ -32,6 +32,39 @@ if [[ ! -d /oldrun/archiso/copytoram ]]; then fi fi + +#JM +#This is where the reboot would go +echo "------------------------" +#bootdev is created in rc.local on startup +bootdev=$( cat /bootdev.txt ) +if [ -f /proc/sys/dev/cdrom/info ] +then + cdroms=$( cat /proc/sys/dev/cdrom/info | { while read a b c; do + #echo $a $b $c + if [ "${a}" = "drive" -a "${b}" = "name:" ]; then + echo ${c} + break + fi + done + } ) + for d in ${cdroms} + do + if [ "/dev/${d}" = "${bootdev}" ] + then + echo "Boot device is a cdrom, ejecting..." + eject ${bootdev} + break + fi + done +fi +echo "------------------------" +sleep 1 +# + + + + # reboot / poweroff / halt, depending on the argument passed by init # if something invalid is passed, we halt case "$1" in diff --git a/build_tools/archiso/archiso/hooks/archiso_shutdown b/build_tools/archiso/archiso/hooks/archiso_shutdown index 24e4103..64295c1 100644 --- a/build_tools/archiso/archiso/hooks/archiso_shutdown +++ b/build_tools/archiso/archiso/hooks/archiso_shutdown @@ -12,6 +12,7 @@ run_hook () cp /bin/mount /run/initramfs/bin/ cp /sbin/dmsetup /run/initramfs/sbin/ cp /sbin/losetup /run/initramfs/sbin/ + if [[ -x /bin/nbd-client ]]; then cp /bin/nbd-client /run/initramfs/bin/ fi diff --git a/build_tools/archiso/mythvantage/packages.x86_64 b/build_tools/archiso/mythvantage/packages.x86_64 new file mode 100644 index 0000000..b0f6178 --- /dev/null +++ b/build_tools/archiso/mythvantage/packages.x86_64 @@ -0,0 +1,150 @@ +sysvinit +initscripts +#b43-fwcutter +acpid +btrfs-progs +crda +#darkhttpd +ddrescue +#dhclient +dhcpcd +dialog +dmraid +#dnsmasq +dnsutils +dcron +dosfstools +dvb-firmware +efibootmgr +#elinks +#gnu-netcat +gptfdisk +fluxbox +plymouth +plymouth-theme-linhes-logo +#haveged +libhdhomerun +hdparm +ipw2100-fw +ipw2200-fw +iputils +#irssi +#lftp +#lilo +#linux-atm +lirc +mtools +#netcfg +net-tools +nfs-utils +nilfs-utils +#nmap +#ntfs-3g +#ntfsprogs +ntp +#openconnect +openssh +#openvpn +parted +#pptpclient +#rp-pppoe +rsync +#smartmontools +#speedtouch +#tcpdump +#vpnc +v86d +wireless_tools +wpa_actiond +zd1211-firmware +python2 +LinHES-config +bc +libstatgrab +mysql-python +expect +curl +dnsutils +parted +sg3_utils +nmbscan +squashfs-tools +rsync +python-parted +python-pexpect +python-netifaces +python-iplib +openssh +xorg-apps +xorg-fonts +windowmaker +xf86-video-vesa +xorg-xinit +xorg-server +xorg-bdftopcf +xorg-docs +xorg-font-util +xorg-fonts-100dpi +#xorg-fonts-75dpi +xorg-fonts-encodings +xorg-iceauth +xorg-luit +xorg-mkfontdir +xorg-mkfontscale +#xorg-res-utils +xorg-server +xorg-sessreg +xorg-setxkbmap +xorg-x11perf +xorg-xauth +xorg-xbacklight +xorg-xcmsdb +xorg-xcursorgen +xorg-xdpyinfo +xorg-xdriinfo +xorg-xev +#xorg-xgamma +xorg-xhost +xorg-xinput +xorg-xkbcomp +xorg-xkbevd +xorg-xkbutils +xorg-xkill +xorg-xlsatoms +xorg-xlsclients +xorg-xmodmap +xorg-xpr +xorg-xprop +xorg-xrandr +xorg-xrdb +xorg-xrefresh +xorg-xset +xorg-xsetroot +xorg-xvinfo +xorg-xwd +xorg-xwininfo +xorg-xwud +xterm +xkeyboard-config +grub-common +grub-bios +LinHES-config +LinHES-system +mythtv +mysql +etcnet +alt_wm +mlocate + + +#mythtv-contrib +mytharchive +mythbrowser +mythgallery +mythgame +mythmusic +linhes-theme +linhes-scripts + +ivtv-utils +alsa-utils diff --git a/build_tools/archiso/mythvantage/packages.x86_64.cache b/build_tools/archiso/mythvantage/packages.x86_64.cache new file mode 100644 index 0000000..7341039 --- /dev/null +++ b/build_tools/archiso/mythvantage/packages.x86_64.cache @@ -0,0 +1,27 @@ +runit-scripts +mythdb-initial +tigervnc +x11vnc +nvidia +nvidia-utils +vdpauinfo +lighttpd +local-website +mythweb +nfs-utils +samba +mplayer +lcdproc +mythappletrailers +xscreensaver +supplemental-web +supplemental-web-slave +romdb +miro +oss +xf86-input-vmmouse +xf86-video-vmware +xf86-video-vesa +xf86-video-intel +libgl +svga-dri diff --git a/build_tools/archiso/mythvantage/pacman.conf b/build_tools/archiso/mythvantage/pacman.conf new file mode 100644 index 0000000..76f27c1 --- /dev/null +++ b/build_tools/archiso/mythvantage/pacman.conf @@ -0,0 +1,79 @@ +# +# /etc/pacman.conf +# +# See the pacman.conf(5) manpage for option and repository directives + +# +# GENERAL OPTIONS +# +[options] +# The following paths are commented out with their default values listed. +# If you wish to use different paths, uncomment and update the paths. +#RootDir = / +#DBPath = /var/lib/pacman/ +CacheDir = /data/storage/disk0/pacman/pkg +#LogFile = /var/log/pacman.log +#GPGDir = /etc/pacman.d/gnupg/ +HoldPkg = pacman glibc +# If upgrades are available for these packages they will be asked for first +SyncFirst = pacman +#XferCommand = /usr/bin/curl -C - -f %u > %o +#XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u +#CleanMethod = KeepInstalled +Architecture = auto + +# Pacman won't upgrade packages listed in IgnorePkg and members of IgnoreGroup +#IgnorePkg = +#IgnoreGroup = + +#NoUpgrade = +#NoExtract = + +# Misc options +#UseSyslog +#UseDelta +#TotalDownload +# We cannot check disk space from within a chroot environment +#CheckSpace +VerbosePkgLists + +# By default, pacman accepts packages signed by keys that its local keyring +# trusts (see pacman-key and its man page), as well as unsigned packages. +SigLevel = Optional TrustedOnly + +# NOTE: You must run `pacman-key --init` before first using pacman; the local +# keyring can then be populated with the keys of all official Arch Linux +# packagers with `pacman-key --populate archlinux`. + +# +# REPOSITORIES +# - can be defined here or included from another file +# - pacman will search repositories in the order defined here +# - local/custom mirrors can be added here or in separate files +# - repositories listed first will take precedence when packages +# have identical names, regardless of version number +# - URLs will have $repo replaced by the name of the current repo +# - URLs will have $arch replaced by the name of the architecture +# +# Repository entries are of the format: +# [repo-name] +# Server = ServerName +# Include = IncludePath +# +# The header [repo-name] is crucial - it must be present and +# uncommented to enable the repo. +# + +# The testing repositories are disabled by default. To enable, uncomment the +# repo name header and Include lines. You can add preferred servers immediately +# after the header, and they will be used before the default mirrors. + + + +[core-testing] +SigLevel = Optional TrustedOnly +Server = http://localmirror.lan/repo/$arch/$repo/ + +[extra-testing] +SigLevel = Optional TrustedOnly +Server = http://localmirror.lan/repo/$arch/$repo/ diff --git a/build_tools/archiso/mythvantage/pristine.list b/build_tools/archiso/mythvantage/pristine.list new file mode 100644 index 0000000..8d732d6 --- /dev/null +++ b/build_tools/archiso/mythvantage/pristine.list @@ -0,0 +1,2 @@ +./etc/hosts +./etc/rc.local diff --git a/build_tools/archiso/mythvantage/profile_files/packages.x86_64 b/build_tools/archiso/mythvantage/profile_files/packages.x86_64 index 0f3b433..b0f6178 100644 --- a/build_tools/archiso/mythvantage/profile_files/packages.x86_64 +++ b/build_tools/archiso/mythvantage/profile_files/packages.x86_64 @@ -1,3 +1,5 @@ +sysvinit +initscripts #b43-fwcutter acpid btrfs-progs @@ -17,7 +19,11 @@ efibootmgr #elinks #gnu-netcat gptfdisk +fluxbox +plymouth +plymouth-theme-linhes-logo #haveged +libhdhomerun hdparm ipw2100-fw ipw2200-fw @@ -26,6 +32,7 @@ iputils #lftp #lilo #linux-atm +lirc mtools #netcfg net-tools @@ -46,6 +53,7 @@ rsync #speedtouch #tcpdump #vpnc +v86d wireless_tools wpa_actiond zd1211-firmware diff --git a/build_tools/archiso/mythvantage/profile_files/packages.x86_64.cache b/build_tools/archiso/mythvantage/profile_files/packages.x86_64.cache index 4de8d09..7341039 100644 --- a/build_tools/archiso/mythvantage/profile_files/packages.x86_64.cache +++ b/build_tools/archiso/mythvantage/profile_files/packages.x86_64.cache @@ -1,7 +1,7 @@ runit-scripts mythdb-initial tigervnc - +x11vnc nvidia nvidia-utils vdpauinfo @@ -15,6 +15,7 @@ lcdproc mythappletrailers xscreensaver supplemental-web +supplemental-web-slave romdb miro oss diff --git a/build_tools/archiso/mythvantage/root-image/etc/rc.local b/build_tools/archiso/mythvantage/root-image/etc/rc.local index b6ea57e..6e49dc1 100755 --- a/build_tools/archiso/mythvantage/root-image/etc/rc.local +++ b/build_tools/archiso/mythvantage/root-image/etc/rc.local @@ -23,7 +23,9 @@ function install_db { } - +#set bootdev.txt for shutdown eject in archiso_shutdown +mount|grep bootmnt|cut -f1 -d" " > /run/initramfs/bootdev.txt +cp -f /usr/bin/eject /run/initramfs/usr/bin/eject #check to see if mysql is running stat_busy "Checking Mysql" diff --git a/build_tools/archiso/mythvantage/root-image/etc/sudoers.d/g_wheel b/build_tools/archiso/mythvantage/root-image/etc/sudoers.d/g_wheel new file mode 100755 index 0000000..8c45359 --- /dev/null +++ b/build_tools/archiso/mythvantage/root-image/etc/sudoers.d/g_wheel @@ -0,0 +1 @@ +%wheel ALL=(ALL) NOPASSWD: ALL diff --git a/build_tools/archiso/mythvantage/root-image/root/LinHES-install.sh b/build_tools/archiso/mythvantage/root-image/root/LinHES-install.sh index a4f8bd7..704112d 100755 --- a/build_tools/archiso/mythvantage/root-image/root/LinHES-install.sh +++ b/build_tools/archiso/mythvantage/root-image/root/LinHES-install.sh @@ -11,6 +11,7 @@ export MALLOC_CHECK_=0 xset s off xset -dpms xhost + +xdotool mousemove 0 0 CMDLINE=$(cat /proc/cmdline) echo $CMDLINE |grep -q nfsroot @@ -26,7 +27,7 @@ MythVantage -r if [ x$NFSROOT = x1 ] then - unbuffer MythVantage & + unbuffer MythVantage -L & else NETBOOT=YES MythVantage & fi diff --git a/build_tools/archiso/mythvantage/root-image/root/startx b/build_tools/archiso/mythvantage/root-image/root/startx index ca11cdc..829f1db 100755 --- a/build_tools/archiso/mythvantage/root-image/root/startx +++ b/build_tools/archiso/mythvantage/root-image/root/startx @@ -12,12 +12,10 @@ USEVNC=$? if [ x$USEVNC = x1 ] then - $MV_ROOT/bin/xconfig.sh 2>/dev/null -# cat /etc/X11/xorg.conf | sed -e 's/dev\/mouse/dev\/psaux/g'> /root/xorg.conf.install - #startx /root/LinHES-install.sh -- -logverbose 6 -config /root/xorg.conf.install -allowMouseOpenFail 2>/tmp/x.log + RUNP=1 $MV_ROOT/bin/xconfig.sh 2>/dev/null startx /root/LinHES-install.sh -- -logverbose 6 -allowMouseOpenFail 2>/tmp/x.log - else - #VNC +else + #VNC pacman -Sf --noconfirm tigervnc /etc/rc.d/dbus start cp -f $TEMPLATES/vnc.service /etc/avahi/services/ diff --git a/build_tools/bin/mpv2.py b/build_tools/bin/mpv2.py index bcbbfec..b21ed29 100755 --- a/build_tools/bin/mpv2.py +++ b/build_tools/bin/mpv2.py @@ -546,7 +546,9 @@ class Packagefile(object): print " Package file:",self.TOTALPKG # Remove old package(s) from local copy - oldpkgcheck = re.compile( i + "-" + self.epoch + '(pkgver|[\d.]+)' + "-" + '(?!pkgrel)' ) + #print i + "-" + self.epoch + '(pkgver|[\d.]+)' + "-" + '(?!pkgrel)' + oldpkgcheck = re.compile( re.escape(i) + "-" + self.epoch + '(pkgver|[\d.]+)' + "-" + '(?!pkgrel)' ) + dirlist = os.listdir(self.DOCROOT) for n in dirlist: if n.startswith(i): @@ -588,7 +590,7 @@ class Packagefile(object): sys.exit(2) i = self.pkglist[0] - oldpkgcheck = re.compile( i + "-" + self.epoch + '(pkgver|[\d.]+)' + "-" + '(?!pkgrel)' ) + oldpkgcheck = re.compile( re.escape(i) + "-" + self.epoch + '(pkgver|[\d.]+)' + "-" + '(?!pkgrel)' ) dirlist = os.listdir(SRCPKGHOME + "/" ) if self.pkgbase: # Remove old src package(s) from local copy |