From c5bb2c762596200b21b2b45cdbc18f01144f1332 Mon Sep 17 00:00:00 2001 From: James Meyer Date: Sat, 11 Oct 2008 14:51:03 -0500 Subject: Modify build profiles to not use inittab --- .../larch/profiles/i686-testing-REMOTE/addedpacks | 6 ++++ .../larch/profiles/i686-testing-REMOTE/cache_packs | 2 ++ .../cd-root/isolinux/isolinux.cfg | 8 +----- .../profiles/i686-testing-REMOTE/post-process.sh | 6 ++-- .../post_process/modify_chroot.sh | 13 +++++++++ .../i686-testing-REMOTE/post_process/rc.conf | 2 +- .../i686-testing-REMOTE/post_process/tweak.sh | 32 ---------------------- .../i686-testing-REMOTE/rootoverlay/etc/inittab | 2 +- .../i686-testing-REMOTE/rootoverlay/etc/rc.local | 17 ++++++++++-- .../rootoverlay/root/.fluxbox/apps | 2 ++ .../rootoverlay/root/LinHES-install.sh | 25 +++++++++++++++++ .../i686-testing-REMOTE/rootoverlay/root/startx | 28 +++++++++++++++++++ .../cd-root/isolinux/isolinux.cfg | 8 +----- .../i686-testing-local-httpd/post-process.sh | 6 ++-- .../post_process/modify_chroot.sh | 13 +++++++++ .../i686-testing-local-httpd/post_process/tweak.sh | 32 ---------------------- .../rootoverlay/etc/inittab | 2 +- .../rootoverlay/etc/rc.local | 17 ++++++++++-- .../rootoverlay/root/.fluxbox/apps | 2 ++ .../rootoverlay/root/LinHES-install.sh | 25 +++++++++++++++++ .../rootoverlay/root/startx | 28 +++++++++++++++++++ .../cd-root/isolinux/isolinux.cfg | 8 +----- .../profiles/i686-testing-local/post-process.sh | 6 ++-- .../post_process/modify_chroot.sh | 13 +++++++++ .../i686-testing-local/post_process/tweak.sh | 32 ---------------------- .../i686-testing-local/rootoverlay/etc/inittab | 2 +- .../i686-testing-local/rootoverlay/etc/rc.local | 17 ++++++++++-- .../rootoverlay/root/.fluxbox/apps | 2 ++ .../rootoverlay/root/LinHES-install.sh | 25 +++++++++++++++++ .../i686-testing-local/rootoverlay/root/startx | 28 +++++++++++++++++++ build_tools/clarch/sync_profile.sh | 6 ++-- 31 files changed, 273 insertions(+), 142 deletions(-) create mode 100755 build_tools/clarch/larch/profiles/i686-testing-REMOTE/post_process/modify_chroot.sh delete mode 100755 build_tools/clarch/larch/profiles/i686-testing-REMOTE/post_process/tweak.sh create mode 100644 build_tools/clarch/larch/profiles/i686-testing-REMOTE/rootoverlay/root/.fluxbox/apps create mode 100755 build_tools/clarch/larch/profiles/i686-testing-REMOTE/rootoverlay/root/LinHES-install.sh create mode 100755 build_tools/clarch/larch/profiles/i686-testing-REMOTE/rootoverlay/root/startx create mode 100755 build_tools/clarch/larch/profiles/i686-testing-local-httpd/post_process/modify_chroot.sh delete mode 100755 build_tools/clarch/larch/profiles/i686-testing-local-httpd/post_process/tweak.sh create mode 100644 build_tools/clarch/larch/profiles/i686-testing-local-httpd/rootoverlay/root/.fluxbox/apps create mode 100755 build_tools/clarch/larch/profiles/i686-testing-local-httpd/rootoverlay/root/LinHES-install.sh create mode 100755 build_tools/clarch/larch/profiles/i686-testing-local-httpd/rootoverlay/root/startx create mode 100755 build_tools/clarch/larch/profiles/i686-testing-local/post_process/modify_chroot.sh delete mode 100755 build_tools/clarch/larch/profiles/i686-testing-local/post_process/tweak.sh create mode 100644 build_tools/clarch/larch/profiles/i686-testing-local/rootoverlay/root/.fluxbox/apps create mode 100755 build_tools/clarch/larch/profiles/i686-testing-local/rootoverlay/root/LinHES-install.sh create mode 100755 build_tools/clarch/larch/profiles/i686-testing-local/rootoverlay/root/startx diff --git a/build_tools/clarch/larch/profiles/i686-testing-REMOTE/addedpacks b/build_tools/clarch/larch/profiles/i686-testing-REMOTE/addedpacks index 6668d64..a9262f4 100644 --- a/build_tools/clarch/larch/profiles/i686-testing-REMOTE/addedpacks +++ b/build_tools/clarch/larch/profiles/i686-testing-REMOTE/addedpacks @@ -52,6 +52,7 @@ xterm xorg-fonts-100dpi xorg-fonts-75dpi xorg-res-utils +ttf-ms-fonts #xorg-video-drivers xf86-video-amd @@ -166,5 +167,10 @@ zd1211-firmware #---- live-installer +LinHES-system etcnet runit + +#--- +tweaker + diff --git a/build_tools/clarch/larch/profiles/i686-testing-REMOTE/cache_packs b/build_tools/clarch/larch/profiles/i686-testing-REMOTE/cache_packs index b95e6f4..9f5096b 100644 --- a/build_tools/clarch/larch/profiles/i686-testing-REMOTE/cache_packs +++ b/build_tools/clarch/larch/profiles/i686-testing-REMOTE/cache_packs @@ -1 +1,3 @@ mythdb-initial +nvidia +nvidia-utils diff --git a/build_tools/clarch/larch/profiles/i686-testing-REMOTE/cd-root/isolinux/isolinux.cfg b/build_tools/clarch/larch/profiles/i686-testing-REMOTE/cd-root/isolinux/isolinux.cfg index 26a365a..db1d4b5 100644 --- a/build_tools/clarch/larch/profiles/i686-testing-REMOTE/cd-root/isolinux/isolinux.cfg +++ b/build_tools/clarch/larch/profiles/i686-testing-REMOTE/cd-root/isolinux/isolinux.cfg @@ -18,11 +18,6 @@ MENU LABEL LinHES without splash screen. kernel vmlinuz append initrd=larch.img -label linux-splash -MENU LABEL LinHES with splash screen. -kernel vmlinuz -append initrd=larch.img vga=791 quiet splash - label linux-i810 MENU LABEL with Intel i810 driver (DRI disabled) kernel vmlinuz @@ -31,7 +26,7 @@ append initrd=larch.img i810 label linux-nox MENU LABEL Boot to console (without X windowing) kernel vmlinuz -append initrd=larch.img 3 +append initrd=larch.img noX label linux-c2r MENU LABEL LinHES: copy-to-ram (also activates swap) @@ -43,7 +38,6 @@ MENU LABEL LinHES: Use swap kernel vmlinuz append initrd=larch.img swap - label memtest MENU LABEL Memory tester kernel memtest diff --git a/build_tools/clarch/larch/profiles/i686-testing-REMOTE/post-process.sh b/build_tools/clarch/larch/profiles/i686-testing-REMOTE/post-process.sh index 131b907..883d9ad 100755 --- a/build_tools/clarch/larch/profiles/i686-testing-REMOTE/post-process.sh +++ b/build_tools/clarch/larch/profiles/i686-testing-REMOTE/post-process.sh @@ -4,9 +4,9 @@ INSTDIR=$1 PROFILE=$2 #everything below this point is specific to MythVantage -cp -rp $PROFILE/post_process $INSTDIR/.tweak -chroot $INSTDIR .tweak/tweak.sh -rm -rf $INSTDIR/.tweak +cp -rp $PROFILE/post_process $INSTDIR/.post_process +chroot $INSTDIR .post_process/modify_chroot.sh +rm -rf $INSTDIR/.post_process #find the size of the install. #This is used to calculate progress on the install diff --git a/build_tools/clarch/larch/profiles/i686-testing-REMOTE/post_process/modify_chroot.sh b/build_tools/clarch/larch/profiles/i686-testing-REMOTE/post_process/modify_chroot.sh new file mode 100755 index 0000000..3ce8db9 --- /dev/null +++ b/build_tools/clarch/larch/profiles/i686-testing-REMOTE/post_process/modify_chroot.sh @@ -0,0 +1,13 @@ +#!/bin/bash + +useradd -m -s /bin/bash mythtv -G audio,video,optical,storage,users +cp -rvpf /.post_process/home/mythtv /home/ +cp -rvpf /.post_process/home/mythtv/.fluxbox /root +chown -R mythtv.mythtv /home/mythtv/ + +cp -f /.post_process/hosts.allow /etc/hosts.allow +cp -f /.post_process/rc.conf /etc/rc.conf +cp -f /.post_process/rc.shutdown /etc/rc.shutdown +cp -f /.post_process/menu.lst /boot/grub/menu.lst + +cp -f /etc/skel/.bash* /root/ \ No newline at end of file diff --git a/build_tools/clarch/larch/profiles/i686-testing-REMOTE/post_process/rc.conf b/build_tools/clarch/larch/profiles/i686-testing-REMOTE/post_process/rc.conf index 1d5b377..856b0be 100755 --- a/build_tools/clarch/larch/profiles/i686-testing-REMOTE/post_process/rc.conf +++ b/build_tools/clarch/larch/profiles/i686-testing-REMOTE/post_process/rc.conf @@ -21,7 +21,7 @@ TIMEZONE="US/Central" KEYMAP="us" CONSOLEFONT= CONSOLEMAP= -USECOLOR="no" +USECOLOR="yes" # # ----------------------------------------------------------------------- diff --git a/build_tools/clarch/larch/profiles/i686-testing-REMOTE/post_process/tweak.sh b/build_tools/clarch/larch/profiles/i686-testing-REMOTE/post_process/tweak.sh deleted file mode 100755 index 5c73cf4..0000000 --- a/build_tools/clarch/larch/profiles/i686-testing-REMOTE/post_process/tweak.sh +++ /dev/null @@ -1,32 +0,0 @@ -#!/bin/bash - -useradd -m -s /bin/bash mythtv -G audio,video,optical,storage,users -echo 'setting mythtv password to "a" ' -passwd mythtv </dev/null +#search for remote +init_remote + +/root/startx & + + + # Set up automatically logged in user (larch live system only) if [ -f /.livesys/autologin ]; then cp /.livesys/autologin /tmp/newuser fi -# Restore saved sound volume, etc. -#alsactl restore -#install initial database diff --git a/build_tools/clarch/larch/profiles/i686-testing-REMOTE/rootoverlay/root/.fluxbox/apps b/build_tools/clarch/larch/profiles/i686-testing-REMOTE/rootoverlay/root/.fluxbox/apps new file mode 100644 index 0000000..68fae0a --- /dev/null +++ b/build_tools/clarch/larch/profiles/i686-testing-REMOTE/rootoverlay/root/.fluxbox/apps @@ -0,0 +1,2 @@ +[startup] {feh --bg-scale ~/.fluxbox/wallpaper.png} + diff --git a/build_tools/clarch/larch/profiles/i686-testing-REMOTE/rootoverlay/root/LinHES-install.sh b/build_tools/clarch/larch/profiles/i686-testing-REMOTE/rootoverlay/root/LinHES-install.sh new file mode 100755 index 0000000..f11b365 --- /dev/null +++ b/build_tools/clarch/larch/profiles/i686-testing-REMOTE/rootoverlay/root/LinHES-install.sh @@ -0,0 +1,25 @@ +#!/bin/bash +#redirect stderr to stdout, then rediret stdout to file +. /etc/profile +exec 2>&1 +exec > /tmp/mythvantage_install.log +#/usr/bin/nvidia-settings -a InitialPixmapPlacement=2 +#keylaunch & +#/usr/bin/tilda & +#/usr/X11R6/bin/unclutter -root -idle 0 -jitter 400 -noevents & +export MALLOC_CHECK_=0 + +xhost + + +CMDLINE=$(cat /proc/cmdline) +echo $CMDLINE |grep -q nfsroot +NFSROOT=$? +if [ x$NFSROOT = x1 ] +then + + unbuffer MythVantage & +else + NETBOOT=YES MythVantage & +fi + +exec fluxbox diff --git a/build_tools/clarch/larch/profiles/i686-testing-REMOTE/rootoverlay/root/startx b/build_tools/clarch/larch/profiles/i686-testing-REMOTE/rootoverlay/root/startx new file mode 100755 index 0000000..304b722 --- /dev/null +++ b/build_tools/clarch/larch/profiles/i686-testing-REMOTE/rootoverlay/root/startx @@ -0,0 +1,28 @@ +#!/bin/bash +. /etc/profile + +export USER=root +export HOME=/root + +CMDLINE=$(cat /proc/cmdline) +TEMPVAR=${CMDLINE#*ip=} +IP=${TEMPVAR%% *} +echo $CMDLINE |grep -q vnc +USEVNC=$? + +if [ x$USEVNC = x1 ] +then + $MV_ROOT/bin/xconfig.sh + cat /etc/X11/xorg.conf | sed -e 's/dev\/mouse/dev\/psaux/g'> /root/xorg.conf.install + startx /root/LinHES-install.sh -- -config /root/xorg.conf.install -allowMouseOpenFail + else + #VNC + pacman -Sf --noconfirm tightvnc + cd /root + mkdir .vnc + echo mythvantage |vncpasswd -f > /root/.vnc/passwd + chmod 500 /root/.vnc/passwd + rm /root/.vnc/xstartup + ln -s /root/LinHES-install.sh /root/.vnc/xstartup + vncserver +fi diff --git a/build_tools/clarch/larch/profiles/i686-testing-local-httpd/cd-root/isolinux/isolinux.cfg b/build_tools/clarch/larch/profiles/i686-testing-local-httpd/cd-root/isolinux/isolinux.cfg index 26a365a..db1d4b5 100644 --- a/build_tools/clarch/larch/profiles/i686-testing-local-httpd/cd-root/isolinux/isolinux.cfg +++ b/build_tools/clarch/larch/profiles/i686-testing-local-httpd/cd-root/isolinux/isolinux.cfg @@ -18,11 +18,6 @@ MENU LABEL LinHES without splash screen. kernel vmlinuz append initrd=larch.img -label linux-splash -MENU LABEL LinHES with splash screen. -kernel vmlinuz -append initrd=larch.img vga=791 quiet splash - label linux-i810 MENU LABEL with Intel i810 driver (DRI disabled) kernel vmlinuz @@ -31,7 +26,7 @@ append initrd=larch.img i810 label linux-nox MENU LABEL Boot to console (without X windowing) kernel vmlinuz -append initrd=larch.img 3 +append initrd=larch.img noX label linux-c2r MENU LABEL LinHES: copy-to-ram (also activates swap) @@ -43,7 +38,6 @@ MENU LABEL LinHES: Use swap kernel vmlinuz append initrd=larch.img swap - label memtest MENU LABEL Memory tester kernel memtest diff --git a/build_tools/clarch/larch/profiles/i686-testing-local-httpd/post-process.sh b/build_tools/clarch/larch/profiles/i686-testing-local-httpd/post-process.sh index 131b907..883d9ad 100755 --- a/build_tools/clarch/larch/profiles/i686-testing-local-httpd/post-process.sh +++ b/build_tools/clarch/larch/profiles/i686-testing-local-httpd/post-process.sh @@ -4,9 +4,9 @@ INSTDIR=$1 PROFILE=$2 #everything below this point is specific to MythVantage -cp -rp $PROFILE/post_process $INSTDIR/.tweak -chroot $INSTDIR .tweak/tweak.sh -rm -rf $INSTDIR/.tweak +cp -rp $PROFILE/post_process $INSTDIR/.post_process +chroot $INSTDIR .post_process/modify_chroot.sh +rm -rf $INSTDIR/.post_process #find the size of the install. #This is used to calculate progress on the install diff --git a/build_tools/clarch/larch/profiles/i686-testing-local-httpd/post_process/modify_chroot.sh b/build_tools/clarch/larch/profiles/i686-testing-local-httpd/post_process/modify_chroot.sh new file mode 100755 index 0000000..3ce8db9 --- /dev/null +++ b/build_tools/clarch/larch/profiles/i686-testing-local-httpd/post_process/modify_chroot.sh @@ -0,0 +1,13 @@ +#!/bin/bash + +useradd -m -s /bin/bash mythtv -G audio,video,optical,storage,users +cp -rvpf /.post_process/home/mythtv /home/ +cp -rvpf /.post_process/home/mythtv/.fluxbox /root +chown -R mythtv.mythtv /home/mythtv/ + +cp -f /.post_process/hosts.allow /etc/hosts.allow +cp -f /.post_process/rc.conf /etc/rc.conf +cp -f /.post_process/rc.shutdown /etc/rc.shutdown +cp -f /.post_process/menu.lst /boot/grub/menu.lst + +cp -f /etc/skel/.bash* /root/ \ No newline at end of file diff --git a/build_tools/clarch/larch/profiles/i686-testing-local-httpd/post_process/tweak.sh b/build_tools/clarch/larch/profiles/i686-testing-local-httpd/post_process/tweak.sh deleted file mode 100755 index 5c73cf4..0000000 --- a/build_tools/clarch/larch/profiles/i686-testing-local-httpd/post_process/tweak.sh +++ /dev/null @@ -1,32 +0,0 @@ -#!/bin/bash - -useradd -m -s /bin/bash mythtv -G audio,video,optical,storage,users -echo 'setting mythtv password to "a" ' -passwd mythtv </dev/null +#search for remote +init_remote + +/root/startx & + + + # Set up automatically logged in user (larch live system only) if [ -f /.livesys/autologin ]; then cp /.livesys/autologin /tmp/newuser fi -# Restore saved sound volume, etc. -#alsactl restore -#install initial database diff --git a/build_tools/clarch/larch/profiles/i686-testing-local-httpd/rootoverlay/root/.fluxbox/apps b/build_tools/clarch/larch/profiles/i686-testing-local-httpd/rootoverlay/root/.fluxbox/apps new file mode 100644 index 0000000..68fae0a --- /dev/null +++ b/build_tools/clarch/larch/profiles/i686-testing-local-httpd/rootoverlay/root/.fluxbox/apps @@ -0,0 +1,2 @@ +[startup] {feh --bg-scale ~/.fluxbox/wallpaper.png} + diff --git a/build_tools/clarch/larch/profiles/i686-testing-local-httpd/rootoverlay/root/LinHES-install.sh b/build_tools/clarch/larch/profiles/i686-testing-local-httpd/rootoverlay/root/LinHES-install.sh new file mode 100755 index 0000000..f11b365 --- /dev/null +++ b/build_tools/clarch/larch/profiles/i686-testing-local-httpd/rootoverlay/root/LinHES-install.sh @@ -0,0 +1,25 @@ +#!/bin/bash +#redirect stderr to stdout, then rediret stdout to file +. /etc/profile +exec 2>&1 +exec > /tmp/mythvantage_install.log +#/usr/bin/nvidia-settings -a InitialPixmapPlacement=2 +#keylaunch & +#/usr/bin/tilda & +#/usr/X11R6/bin/unclutter -root -idle 0 -jitter 400 -noevents & +export MALLOC_CHECK_=0 + +xhost + + +CMDLINE=$(cat /proc/cmdline) +echo $CMDLINE |grep -q nfsroot +NFSROOT=$? +if [ x$NFSROOT = x1 ] +then + + unbuffer MythVantage & +else + NETBOOT=YES MythVantage & +fi + +exec fluxbox diff --git a/build_tools/clarch/larch/profiles/i686-testing-local-httpd/rootoverlay/root/startx b/build_tools/clarch/larch/profiles/i686-testing-local-httpd/rootoverlay/root/startx new file mode 100755 index 0000000..304b722 --- /dev/null +++ b/build_tools/clarch/larch/profiles/i686-testing-local-httpd/rootoverlay/root/startx @@ -0,0 +1,28 @@ +#!/bin/bash +. /etc/profile + +export USER=root +export HOME=/root + +CMDLINE=$(cat /proc/cmdline) +TEMPVAR=${CMDLINE#*ip=} +IP=${TEMPVAR%% *} +echo $CMDLINE |grep -q vnc +USEVNC=$? + +if [ x$USEVNC = x1 ] +then + $MV_ROOT/bin/xconfig.sh + cat /etc/X11/xorg.conf | sed -e 's/dev\/mouse/dev\/psaux/g'> /root/xorg.conf.install + startx /root/LinHES-install.sh -- -config /root/xorg.conf.install -allowMouseOpenFail + else + #VNC + pacman -Sf --noconfirm tightvnc + cd /root + mkdir .vnc + echo mythvantage |vncpasswd -f > /root/.vnc/passwd + chmod 500 /root/.vnc/passwd + rm /root/.vnc/xstartup + ln -s /root/LinHES-install.sh /root/.vnc/xstartup + vncserver +fi diff --git a/build_tools/clarch/larch/profiles/i686-testing-local/cd-root/isolinux/isolinux.cfg b/build_tools/clarch/larch/profiles/i686-testing-local/cd-root/isolinux/isolinux.cfg index 26a365a..db1d4b5 100644 --- a/build_tools/clarch/larch/profiles/i686-testing-local/cd-root/isolinux/isolinux.cfg +++ b/build_tools/clarch/larch/profiles/i686-testing-local/cd-root/isolinux/isolinux.cfg @@ -18,11 +18,6 @@ MENU LABEL LinHES without splash screen. kernel vmlinuz append initrd=larch.img -label linux-splash -MENU LABEL LinHES with splash screen. -kernel vmlinuz -append initrd=larch.img vga=791 quiet splash - label linux-i810 MENU LABEL with Intel i810 driver (DRI disabled) kernel vmlinuz @@ -31,7 +26,7 @@ append initrd=larch.img i810 label linux-nox MENU LABEL Boot to console (without X windowing) kernel vmlinuz -append initrd=larch.img 3 +append initrd=larch.img noX label linux-c2r MENU LABEL LinHES: copy-to-ram (also activates swap) @@ -43,7 +38,6 @@ MENU LABEL LinHES: Use swap kernel vmlinuz append initrd=larch.img swap - label memtest MENU LABEL Memory tester kernel memtest diff --git a/build_tools/clarch/larch/profiles/i686-testing-local/post-process.sh b/build_tools/clarch/larch/profiles/i686-testing-local/post-process.sh index 131b907..883d9ad 100755 --- a/build_tools/clarch/larch/profiles/i686-testing-local/post-process.sh +++ b/build_tools/clarch/larch/profiles/i686-testing-local/post-process.sh @@ -4,9 +4,9 @@ INSTDIR=$1 PROFILE=$2 #everything below this point is specific to MythVantage -cp -rp $PROFILE/post_process $INSTDIR/.tweak -chroot $INSTDIR .tweak/tweak.sh -rm -rf $INSTDIR/.tweak +cp -rp $PROFILE/post_process $INSTDIR/.post_process +chroot $INSTDIR .post_process/modify_chroot.sh +rm -rf $INSTDIR/.post_process #find the size of the install. #This is used to calculate progress on the install diff --git a/build_tools/clarch/larch/profiles/i686-testing-local/post_process/modify_chroot.sh b/build_tools/clarch/larch/profiles/i686-testing-local/post_process/modify_chroot.sh new file mode 100755 index 0000000..3ce8db9 --- /dev/null +++ b/build_tools/clarch/larch/profiles/i686-testing-local/post_process/modify_chroot.sh @@ -0,0 +1,13 @@ +#!/bin/bash + +useradd -m -s /bin/bash mythtv -G audio,video,optical,storage,users +cp -rvpf /.post_process/home/mythtv /home/ +cp -rvpf /.post_process/home/mythtv/.fluxbox /root +chown -R mythtv.mythtv /home/mythtv/ + +cp -f /.post_process/hosts.allow /etc/hosts.allow +cp -f /.post_process/rc.conf /etc/rc.conf +cp -f /.post_process/rc.shutdown /etc/rc.shutdown +cp -f /.post_process/menu.lst /boot/grub/menu.lst + +cp -f /etc/skel/.bash* /root/ \ No newline at end of file diff --git a/build_tools/clarch/larch/profiles/i686-testing-local/post_process/tweak.sh b/build_tools/clarch/larch/profiles/i686-testing-local/post_process/tweak.sh deleted file mode 100755 index 5c73cf4..0000000 --- a/build_tools/clarch/larch/profiles/i686-testing-local/post_process/tweak.sh +++ /dev/null @@ -1,32 +0,0 @@ -#!/bin/bash - -useradd -m -s /bin/bash mythtv -G audio,video,optical,storage,users -echo 'setting mythtv password to "a" ' -passwd mythtv </dev/null +#search for remote +init_remote + +/root/startx & + + + # Set up automatically logged in user (larch live system only) if [ -f /.livesys/autologin ]; then cp /.livesys/autologin /tmp/newuser fi -# Restore saved sound volume, etc. -#alsactl restore -#install initial database diff --git a/build_tools/clarch/larch/profiles/i686-testing-local/rootoverlay/root/.fluxbox/apps b/build_tools/clarch/larch/profiles/i686-testing-local/rootoverlay/root/.fluxbox/apps new file mode 100644 index 0000000..68fae0a --- /dev/null +++ b/build_tools/clarch/larch/profiles/i686-testing-local/rootoverlay/root/.fluxbox/apps @@ -0,0 +1,2 @@ +[startup] {feh --bg-scale ~/.fluxbox/wallpaper.png} + diff --git a/build_tools/clarch/larch/profiles/i686-testing-local/rootoverlay/root/LinHES-install.sh b/build_tools/clarch/larch/profiles/i686-testing-local/rootoverlay/root/LinHES-install.sh new file mode 100755 index 0000000..f11b365 --- /dev/null +++ b/build_tools/clarch/larch/profiles/i686-testing-local/rootoverlay/root/LinHES-install.sh @@ -0,0 +1,25 @@ +#!/bin/bash +#redirect stderr to stdout, then rediret stdout to file +. /etc/profile +exec 2>&1 +exec > /tmp/mythvantage_install.log +#/usr/bin/nvidia-settings -a InitialPixmapPlacement=2 +#keylaunch & +#/usr/bin/tilda & +#/usr/X11R6/bin/unclutter -root -idle 0 -jitter 400 -noevents & +export MALLOC_CHECK_=0 + +xhost + + +CMDLINE=$(cat /proc/cmdline) +echo $CMDLINE |grep -q nfsroot +NFSROOT=$? +if [ x$NFSROOT = x1 ] +then + + unbuffer MythVantage & +else + NETBOOT=YES MythVantage & +fi + +exec fluxbox diff --git a/build_tools/clarch/larch/profiles/i686-testing-local/rootoverlay/root/startx b/build_tools/clarch/larch/profiles/i686-testing-local/rootoverlay/root/startx new file mode 100755 index 0000000..304b722 --- /dev/null +++ b/build_tools/clarch/larch/profiles/i686-testing-local/rootoverlay/root/startx @@ -0,0 +1,28 @@ +#!/bin/bash +. /etc/profile + +export USER=root +export HOME=/root + +CMDLINE=$(cat /proc/cmdline) +TEMPVAR=${CMDLINE#*ip=} +IP=${TEMPVAR%% *} +echo $CMDLINE |grep -q vnc +USEVNC=$? + +if [ x$USEVNC = x1 ] +then + $MV_ROOT/bin/xconfig.sh + cat /etc/X11/xorg.conf | sed -e 's/dev\/mouse/dev\/psaux/g'> /root/xorg.conf.install + startx /root/LinHES-install.sh -- -config /root/xorg.conf.install -allowMouseOpenFail + else + #VNC + pacman -Sf --noconfirm tightvnc + cd /root + mkdir .vnc + echo mythvantage |vncpasswd -f > /root/.vnc/passwd + chmod 500 /root/.vnc/passwd + rm /root/.vnc/xstartup + ln -s /root/LinHES-install.sh /root/.vnc/xstartup + vncserver +fi diff --git a/build_tools/clarch/sync_profile.sh b/build_tools/clarch/sync_profile.sh index 05d6c25..ed93bd4 100755 --- a/build_tools/clarch/sync_profile.sh +++ b/build_tools/clarch/sync_profile.sh @@ -4,7 +4,7 @@ ARCH=$CARCH SRC_PROFILE=$ARCH-testing-local DEST_PROFILE=$ARCH-testing-local-httpd -rsync --exclude=vbg.jpg --exclude=pacman.conf -av larch/profiles/$SRC_PROFILE/ larch/profiles/$DEST_PROFILE/ +rsync --exclude=vbg.jpg --exclude=pacman.conf --delete -av larch/profiles/$SRC_PROFILE/ larch/profiles/$DEST_PROFILE/ -DEST_PROFILE=$ARCH-testing-REMOTE-httpd -rsync --exclude=vbg.jpg --exclude=pacman.conf -av larch/profiles/$SRC_PROFILE/ larch/profiles/$DEST_PROFILE/ +DEST_PROFILE=$ARCH-testing-REMOTE +rsync --exclude=vbg.jpg --exclude=pacman.conf --delete -av larch/profiles/$SRC_PROFILE/ larch/profiles/$DEST_PROFILE/ -- cgit v0.12