diff options
Diffstat (limited to 'build_tools/clarch/larch/profiles/i686-testing-local')
9 files changed, 87 insertions, 46 deletions
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 <<EOF -a -a -EOF - -echo 'setting root password to "a" ' -passwd root <<EOF -a -a -EOF - -#edit /home/mythtv/.xinitrc and uncomment exec fluxbox -cp -rvpf /.tweak/home/mythtv /home/ - - - -chown -R mythtv.mythtv /home/mythtv/ - - - -cp -f /.tweak/hosts.allow /etc/hosts.allow -cp -f /.tweak/securetty /etc/securetty -cp -f /.tweak/rc.conf /etc/rc.conf -#cp -f rc.local /etc/rc.local -#cp -f locale.gen /etc/locale.gen - -cp -f /.tweak/rc.shutdown /etc/rc.shutdown -cp -f /.tweak/menu.lst /boot/grub/menu.lst diff --git a/build_tools/clarch/larch/profiles/i686-testing-local/rootoverlay/etc/inittab b/build_tools/clarch/larch/profiles/i686-testing-local/rootoverlay/etc/inittab index 2de483f..39003ed 100644 --- a/build_tools/clarch/larch/profiles/i686-testing-local/rootoverlay/etc/inittab +++ b/build_tools/clarch/larch/profiles/i686-testing-local/rootoverlay/etc/inittab @@ -13,7 +13,7 @@ ## Only one of the following two lines can be uncommented! # Boot to console -id:5:initdefault: +id:3:initdefault: # Boot to X11 #id:5:initdefault: diff --git a/build_tools/clarch/larch/profiles/i686-testing-local/rootoverlay/etc/rc.local b/build_tools/clarch/larch/profiles/i686-testing-local/rootoverlay/etc/rc.local index 216ec8e..cdd7966 100755 --- a/build_tools/clarch/larch/profiles/i686-testing-local/rootoverlay/etc/rc.local +++ b/build_tools/clarch/larch/profiles/i686-testing-local/rootoverlay/etc/rc.local @@ -2,15 +2,26 @@ # # /etc/rc.local: Local multi-user startup script. # +. /etc/profile +. ${MV_ROOT}/bin/install_functions.sh + +#check network parms +init_network + + #install initial database pacman -S --noconfirm mythdb-initial 2>/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 |