madmonkey's hakchi mod update

9 files changed, 22 insertions, 23 deletions

diff --git a/mods/mod_hakchi/hakchi/rootfs/etc/preinit.d/b0010_functions b/mods/mod_hakchi/hakchi/rootfs/etc/preinit.d/b0010_functions
index 9085c48d..6ae5fee5 100644
--- a/mods/mod_hakchi/hakchi/rootfs/etc/preinit.d/b0010_functions
+++ b/mods/mod_hakchi/hakchi/rootfs/etc/preinit.d/b0010_functions
@@ -6,7 +6,7 @@ mount_base(){
 
 umount_base(){
   sync
-  umount -r "$mountpoint/var/lib"
+  umount "$mountpoint/var/lib"
   umount "$mountpoint/var"
 }
 
@@ -38,11 +38,13 @@ shutdown(){
   sync
   umount -a -r 2>/dev/null
   poweroff -f
-  while :;do :;done
+  while :;do sleep 1;:;done
 }
 
 early_getty(){
+  cd "$modpath/transfer"
   getty -ni 115200 ttyS0 -l /bin/sh
+  cd /
 }
 
 copy(){
@@ -71,15 +73,15 @@ mount_bind(){
 }
 
 overmount(){
-  l_boot_stock=n
   if [ "$#" == "1" ]; then
     echo overmounting $1
-    mount_bind "$rootfs$1" "$mountpoint$1"
+    mount_bind "$rootfs$1" "$mountpoint$1" && return 0
   fi
   if [ "$#" == "2" ]; then
     echo overmounting $1 on $2
-    mount_bind "$1" "$mountpoint$2"
+    mount_bind "$rootfs$1" "$mountpoint$2" && return 0
   fi
+  echo overmounting failed
 }
 
 overmount_games(){
@@ -89,8 +91,7 @@ overmount_games(){
   echo menu code: $menu_code
   if [ "$menu_code" != "000" ]; then
     if [ -d "$rootfs$gamepath/$menu_code" ]; then
-      overmount "$rootfs$gamepath/$menu_code" "$gamepath"
-      return $?
+      overmount "$gamepath/$menu_code" "$gamepath" && return 0
     fi
   fi
   overmount "$gamepath"
diff --git a/mods/mod_hakchi/hakchi/rootfs/etc/preinit.d/p0000_config b/mods/mod_hakchi/hakchi/rootfs/etc/preinit.d/p0000_config
index e4faab64..68e938f6 100644
--- a/mods/mod_hakchi/hakchi/rootfs/etc/preinit.d/p0000_config
+++ b/mods/mod_hakchi/hakchi/rootfs/etc/preinit.d/p0000_config
@@ -1,6 +1,4 @@
 cfg_boot_stock_firmware='n'
 cfg_boot_stock='n'
-cfg_clovercon_option=''
 cfg_disable_armet='y'
 cfg_nes_extra_args='--ppu-palette 2'
-cfg_savecheck='n'
diff --git a/mods/mod_hakchi/hakchi/rootfs/etc/preinit.d/p7000_preinit b/mods/mod_hakchi/hakchi/rootfs/etc/preinit.d/p7000_preinit
index 5300dc82..6fb17938 100644
--- a/mods/mod_hakchi/hakchi/rootfs/etc/preinit.d/p7000_preinit
+++ b/mods/mod_hakchi/hakchi/rootfs/etc/preinit.d/p7000_preinit
@@ -1,2 +1,9 @@
-echo loading $modname
-local l_boot_stock=y
+if [ "$cfg_boot_stock" == "y" ]; then
+  # load firmware if needed/present
+  source_parts "$preinitpath/p????_*firmware*"
+  # stop loading
+  umount_base 2>/dev/null
+  return 0
+else
+  echo loading $modname
+fi
diff --git a/mods/mod_hakchi/hakchi/rootfs/etc/preinit.d/p7070_firmware b/mods/mod_hakchi/hakchi/rootfs/etc/preinit.d/p7070_firmware
index f56ae926..43d756fd 100644
--- a/mods/mod_hakchi/hakchi/rootfs/etc/preinit.d/p7070_firmware
+++ b/mods/mod_hakchi/hakchi/rootfs/etc/preinit.d/p7070_firmware
@@ -1 +1 @@
-[ "cfg_boot_stock_firmware" == "y" ] || load_firmware
+[ "$cfg_boot_stock_firmware" == "y" ] || load_firmware
diff --git a/mods/mod_hakchi/hakchi/rootfs/etc/preinit.d/p7070_preinit b/mods/mod_hakchi/hakchi/rootfs/etc/preinit.d/p7070_preinit
deleted file mode 100644
index a65e2231..00000000
--- a/mods/mod_hakchi/hakchi/rootfs/etc/preinit.d/p7070_preinit
+++ /dev/null
@@ -1,2 +0,0 @@
-# placeholder
-# rm -f "$preinitpath/p7070_preinit"
diff --git a/mods/mod_hakchi/hakchi/rootfs/etc/preinit.d/p7100_preinit b/mods/mod_hakchi/hakchi/rootfs/etc/preinit.d/p7100_preinit
index 0e7456f7..7110dfb9 100644
--- a/mods/mod_hakchi/hakchi/rootfs/etc/preinit.d/p7100_preinit
+++ b/mods/mod_hakchi/hakchi/rootfs/etc/preinit.d/p7100_preinit
@@ -1,6 +1,2 @@
-overmount_base(){
-  overmount "/bin"
-  overmount "/etc"
-}
-
-[ "$cfg_boot_stock" == "y" ] || overmount_base
+overmount "/bin"
+overmount "/etc"
diff --git a/mods/mod_hakchi/hakchi/rootfs/etc/preinit.d/pa100_games b/mods/mod_hakchi/hakchi/rootfs/etc/preinit.d/pa100_games
index 6df5a265..d0df2442 100644
--- a/mods/mod_hakchi/hakchi/rootfs/etc/preinit.d/pa100_games
+++ b/mods/mod_hakchi/hakchi/rootfs/etc/preinit.d/pa100_games
@@ -1 +1 @@
-[ "$cfg_boot_stock" == "y" ] || overmount_games
+overmount_games
diff --git a/mods/mod_hakchi/hakchi/rootfs/etc/preinit.d/pffff_bootstock b/mods/mod_hakchi/hakchi/rootfs/etc/preinit.d/pffff_bootstock
deleted file mode 100644
index 1159c9b1..00000000
--- a/mods/mod_hakchi/hakchi/rootfs/etc/preinit.d/pffff_bootstock
+++ /dev/null
@@ -1 +0,0 @@
-[ "$l_boot_stock" == "y" ] && umount_base
diff --git a/mods/mod_hakchi/hakchi/rootfs/etc/preinit.d/pffff_config b/mods/mod_hakchi/hakchi/rootfs/etc/preinit.d/pffff_config
index d1e50f5b..9defb135 100644
--- a/mods/mod_hakchi/hakchi/rootfs/etc/preinit.d/pffff_config
+++ b/mods/mod_hakchi/hakchi/rootfs/etc/preinit.d/pffff_config
@@ -1,3 +1,3 @@
-config=p0000_config
+local config=p0000_config
 set | grep -F cfg_ | sort > "$temppath/$config"
 copy "$temppath/$config" "$preinitpath/$config"