Check-in [1a28927a14]
Not logged in

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview

SHA1 Hash:1a28927a1470d12e12c984e5ee0ea7657ae37171
Date: 2012-06-25 21:56:08
User: BarryK
Comment:bootmanager: handle case cannot load sfs files, recognise shinobar sfs-load

Tags And Properties
Changes

Changes to woof-code/rootfs-skeleton/usr/sbin/bootmanager

@@ -38,11 +38,12 @@
 #111011 now using pupdialog instead of Xdialog for sfs chooser.
 #111015 support kernel 3.x.
 #111113 roll back to Xdialog for sfs chooser. pupdialog limited items, some people have 100s sfs's.
 #120201 rodin.s: internationalized.
 #120323 replace 'xmessage' with 'pupmessage'.
-#120527 shinobar's sfs-load on-the-fly pet has /etc/rc.d/BOOTCONFIG.save, sync it...
+#120527 shinobar's sfs-load on-the-fly pet has /etc/rc.d/BOOTCONFIG.save, sync it.
+#120626 only offer to load sfs files if have layered f.s., mention sfs_load.
 
 [ "`whoami`" != "root" ] && exec sudo -A ${0} ${@} #110505
 
 export TEXTDOMAIN=bootmanager
 export OUTPUT_CHARSET=UTF-8
@@ -501,28 +502,49 @@
 if [ "$CLPARAM1" = "sysdaemons" ];then #100125
  sysdaemons_func
  exit
 fi
 
-#######################################################
-
-export MAIN_DIALOG="
-<window title=\"$(gettext 'BootManager')\" icon-name=\"gtk-cdrom\">
-<vbox>
- <text use-markup=\"true\">
- <label>\"<b>$(gettext 'Puppy Boot Configuration')</b>\"</label></text>
-
- <frame $(gettext 'Load SFS files')>
+#120626 only offer to load sfs files if have layered f.s., mention sfs_load...
+if [ -d /initrd ];then #PUPMODE=2, full hd install, will not have this.
+ if [ "`cat /root/.packages/woof-installed-packages /root/.packages/user-installed-packages  | grep '^sfs_load'`" != "" ];then
+  SFSLOAD_XML="<text><label>$(gettext "ALTERNATIVE: Shinobar's SFS_Load application will enable you to install SFS files on-the-fly, that is, load and unload them without having to reboot -- see the 'Setup' menu.")</label></text>" #'geany
+ else
+  SFSLOAD_XML=""
+ fi
+ SFSFRAME_XML="<frame $(gettext 'Load SFS files')>
   <text><label>`eval_gettext \"Puppy has a file named '\\\${DISTRO_PUPPYSFS}' that is always loaded. However, extra SFS files can be loaded at bootup, for example 'kde.sfs' to provide KDE applications, and 'devx.sfs' to provide everything for compiling C/C++ source. These can be thought of as 'combo packs' of many packages in one file.\"`</label></text>
   <hbox>
    <text><label>$(gettext 'Choose which extra SFS files to load at bootup:')</label></text>
     <button>
      <input file>/usr/local/lib/X11/pixmaps/module24.xpm</input>
      <action>bootmanager extrasfs</action>
     </button>
   </hbox>
- </frame>
+  ${SFSLOAD_XML}
+ </frame>"
+else
+ if [ "`cat /root/.packages/woof-installed-packages /root/.packages/user-installed-packages  | grep '^sfs_load'`" != "" ];then
+  SFSLOAD_XML="<text><label>$(gettext "Shinobar's SFS_Load application will enable you to install SFS files -- see the 'Setup' menu.")</label></text>" #'geany
+ else
+  SFSLOAD_XML="<text><label>$(gettext "TECHNICAL: Clicking on an SFS file will open it, and it's contents can then be copied to /. It is recommended to use the '-a -f --remove-destination' parameters for the 'cp' command.")</label></text>" #'geany
+ fi
+ SFSFRAME_XML="<frame $(gettext 'Load SFS files')>
+  <text><label>$(gettext "NOTICE: As this is a full installation of Puppy without an initrd, SFS files cannot be loaded/unloaded at bootup. However, they can be permanently installed.")</label></text>
+  ${SFSLOAD_XML}
+ </frame>"
+fi
+
+#######################################################
+
+export MAIN_DIALOG="
+<window title=\"$(gettext 'BootManager')\" icon-name=\"gtk-cdrom\">
+<vbox>
+ <text use-markup=\"true\">
+ <label>\"<b>$(gettext 'Puppy Boot Configuration')</b>\"</label></text>
+
+ ${SFSFRAME_XML}
 
  <frame $(gettext 'Load kernel modules')>
   <text><label>`gettext \"If a driver module did not get loaded, or the wrong one got loaded, or you want to 'blacklist' a module, this is the place. A common scenario is a driver got auto-loaded, for say your wireless network card, but you cannot or do not want to use it, and want some other module or want to use Ndiswrapper (to use the Windows driver).\"`</label></text>
   <hbox>
    <text><label>`gettext \"Click here to 'blacklist' a module:\"`</label></text>

Changes to woof-code/rootfs-skeleton/usr/sbin/quicksetup

@@ -123,30 +123,29 @@
 #120311 change the logic, allow this frame to persist...
 NETWORK_XML=""
 if [ "$SET_NETWORK" ];then
  SET_NETWORK=""
  if [ ! -f /var/local/quicksetup-network-check-flag1 ];then
-  if [ ! -f /var/local/quicksetup-network-check-flag2 ];then #in case restart X after network connection.
+  #if [ ! -f /var/local/quicksetup-network-check-flag2 ];then #in case restart X after network connection.
    touch /var/local/quicksetup-network-check-flag2
-   if [ $PUPMODE -eq 5 -o $PUPMODE -eq 2 ];then
+   #if [ $PUPMODE -eq 5 -o $PUPMODE -eq 2 ];then
     #if check_internet ;then #case of auto connect to internet via ethernet at 1st boot.
     IFCONFIG="`ifconfig | grep '^[pwe]' | grep -v 'wmaster'`" #test network interface up only.
     if [ "$IFCONFIG" ];then
      touch /var/local/quicksetup-network-check-flag1
     fi
-   fi
-  fi
+   #fi
+  #fi
  fi
 fi
 #      <button tooltip-text=\"$(gettext 'Click button to apply hostname')\">
 #       <input file>/usr/local/lib/X11/mini-icons/mini-hostname.xpm</input>
 #       <action>/usr/sbin/hostname-set \$ENTRY_HOSTNAME ; echo \$? > /tmp/quicksetup-hostname-change-flag</action>
 #      </button>
 #      <text><label>\"                                            \"</label></text>
 if [ "$MYBASE" = "quicksetup" ];then #120313 only allow in main quicksetup window.
- #120625 always display network frame...
- #if [ -f /var/local/quicksetup-network-check-flag1 ];then
+ if [ -f /var/local/quicksetup-network-check-flag1 ];then
     SET_NETWORK="yes"
     HOSTNAME="`cat /etc/hostname`" #do not use $HOSTNAME, as hostname-set may have just been run.
 
     #120625 firewall checkbox...
     TT_CH_F="$(gettext "Tick checkbox to activate the firewall (recommended)")"
@@ -194,11 +193,11 @@
         <button><input file>/usr/local/lib/X11/mini-icons/mini-question.xpm</input><action type=\"launch\">DLG_HELP_NET</action></button>
        </hbox>
       </vbox>
      </hbox>
     </frame>"
- #fi
+ fi
 fi
 
 ###Country localization###
 if [ "$SET_COUNTRY" ];then
 

Changes to woof-distro/arm/debian/squeeze/DISTRO_PKGS_SPECS-debian-squeeze

@@ -573,10 +573,11 @@
 no|searchmonkey||exe
 yes|sed|sed|exe,dev>null,doc,nls
 yes|setserial|setserial|exe,dev>null,doc,nls
 yes|setvol||exe,dev,doc,nls
 yes|sfs-converter||exe
+yes|sfs_load||exe,dev,doc,nls
 no|sgmixer||exe
 yes|sgml-base|sgml-base|exe>dev,dev,doc,nls
 yes|sgml-data|sgml-data|exe>dev,dev,doc,nls
 yes|shared-mime-info||exe,dev
 no|sox||exe,dev,doc,nls

Changes to woof-distro/arm/gentoo/gap6/DISTRO_PKGS_SPECS-gentoo-gap6

@@ -510,11 +510,11 @@
 no|searchmonkey||exe
 yes|sed|sed|exe,dev>null,doc,nls
 no|setserial||exe,dev>null,doc,nls
 yes|setvol||exe,dev,doc,nls
 yes|sfs-converter||exe
-yes|sfs_load||exe
+yes|sfs_load||exe,dev,doc,nls
 no|sgmixer||exe
 yes|sgml-common|sgml-common|exe>dev,dev,doc,nls
 no|shared-mime-info|shared-mime-info|exe,dev,doc,nls|
 yes|shared-mime-info||exe,dev,doc,nls|
 yes|snap2||exe,dev,doc,nls