Check-in [1ca0161873]
Not logged in

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

Overview

SHA1 Hash:1ca0161873a0e84dfc9d3aca2fd9be2f2bb8a625
Date: 2012-03-22 18:43:05
User: BarryK
Comment:shinobar: /etc/rc.d/rc.update: extra operations when layered fs change

Tags And Properties
Changes

Changes to woof-code/rootfs-skeleton/etc/rc.d/rc.update

@@ -26,10 +26,11 @@
 #111009 try fix upgrading old wary save-file.
 #111027 maybe need to fix permissions on /tmp and /var.
 #111123 first-boot fix if did cross-build in Woof.
 #120209 append LANG when call fixmenus. also run fixdesk, fixscripts
 #120225 fix non-english PuppyPin when layers change.
+#120323 shinobar: need some more operations when unionfs layers change.
 
 #This script is called by /etc/rc.d/rc.sysinit. the purpose is to perform
 #any required updates to files when a new version of Puppy is booted.
 
 #this script can also be called by /usr/sbin/puppyinstaller, when doing a full install
@@ -80,11 +81,11 @@
    if [ "$WOOF_HOSTARCH" != "$WOOF_TARGETARCH" ];then #woof did a cross-build
     echo -n " cross-build-fix" >/dev/console
     #these are normally done in 3builddistro.
     ldconfig #ldconfig put in by 3builddistro. rebuild /etc/ld.so.cache
     /usr/sbin/indexgen.sh #create master help index.
-    /usr/sbin/fixmenus #Reconstruct configuration files for JWM, Fvwm95, IceWM.
+    /usr/sbin/fixmenus #Reconstruct configuration files for JWM, Fvwm95, IceWM. 120323 note: fixmenus corrects $LANG.
     /usr/bin/fc-cache -s -v #fontconfig cache
     PANGOMODULES="`find /etc/pango -type f -name pango.modules`"
     [ "$PANGOMODULES" = "" ] && PANGOMODULES='/etc/pango/pango.modules'
     [ ! -s ${PANGOMODULES} ] && pango-querymodules > ${PANGOMODULES}
    fi
@@ -361,26 +362,26 @@
   echo -en " layered-filesystem \\033[1;35mnext boot will be faster!\\033[0;39m" > /dev/console
   echo "Unionfs layers have changed since previous boot, fixing menu..."
   #master help index has to be updated...
   /usr/sbin/indexgen.sh
   #Reconstruct configuration files for JWM, Fvwm95, IceWM...
-  /usr/sbin/fixmenus
+  LANG=$xLANG /usr/sbin/fixmenus
+  fc-cache -f #120323 shinobar: some sfs files may have fonts
+  which gtk-query-immodules-2.0 &>/dev/null && gtk-query-immodules-2.0 > /etc/gtk-2.0/gtk.immodules #120323 shinobar: refresh gtk.immodules
+  depmod #120323 shinobar: and some sfs may have kernel modules.
   #w007 has a 'zdrv' layer been added or removed?...
   EXMOD_CNT=0
-  #zPATTERN='z'"${PREFIX1CHAR}"'[0-9]' #w020 ex: zu500629.sfs
-  #zzPATTERN='^'"$zPATTERN"
-  zzPATTERN="`basename $DISTRO_ZDRVSFS .sfs`" #100913
+  zzPATTERN='zdrv' #120323 have settled on this in all zdrv sfs filenames.
   EXMOD_SFS1="`echo "$xLASTUNIONRECORD" | tr ' ' '\n' | grep "$zzPATTERN"`"
   EXMOD_SFS2="`echo "$xPREVUNIONRECORD" | tr ' ' '\n' | grep "$zzPATTERN"`"
   [ "$EXMOD_SFS1" != "" ] && EXMOD_CNT=1
   [ "$EXMOD_SFS2" != "" ] && EXMOD_CNT=`expr $EXMOD_CNT + 1`
   if [ $EXMOD_CNT -eq 2 ];then
-   #may have changed to a different zdrv sfs...
-   [ "$EXMOD_SFS1" != "$EXMOD_SFS2" ] && EXMOD_CNT=1
+   [ "$EXMOD_SFS1" != "$EXMOD_SFS2" ] && EXMOD_CNT=1 #may have changed to a different zdrv sfs.
   fi
   if [ $EXMOD_CNT -eq 1 ];then
-   depmod
+   #depmod #120323 removed, already done above.
    /usr/sbin/updatenetmoduleslist.sh
   fi
  fi
 
  #fix the desktop...

Changes to woof-distro/Packages-puppy-noarch-official

@@ -35,11 +35,11 @@
 jwmconfig2-20111110|jwmconfig2|20111110||Desktop|256K||jwmconfig2-20111110.pet|+jwm2,+gtkdialog3|JWM configuration. note, theme font spec different from shinobars pet. note, designed to work with jwm 500+||||
 jwm_theme_bluevariety-1|jwm_theme_bluevariety|1||Desktop|32K||jwm_theme_bluevariety-1.pet|+jwm2|jwm window manager theme, many shades and gradients of blue||||
 jwm_theme_deepbluebold-1|jwm_theme_deepbluebold|1||Desktop|36K||jwm_theme_deepbluebold-1.pet|+jwm2|Theme for JWM window manager, deep blue, white bold text||||
 jwmthememaker-1.5|jwmthememaker|1.5||Desktop|36K||jwmthememaker-1.5.pet||JWM Theme Maker|ubuntu|lucid||
 jwm_theme_stark-1|jwm_theme_stark|1||Desktop|36K||jwm_theme_stark-1.pet|+jwm2|stark black-white with bits of colour theme for jwm window manager||||
-langpack_de-20120310|langpack_de|20120310||Setup|3045K||langpack_de-20120310.pet||de language-pack for Puppy Linux, for any Puppy built from Woof later than Feb. 28, 2012||||
+langpack_de-20120321|langpack_de|20120321||Setup|1104K||langpack_de-20120321.pet||de language-pack for Puppy Linux, for any Puppy built from Woof later than Feb. 28, 2012||||
 langpack_es-20120320|langpack_es|20120320||Setup|1104K||langpack_es-20120320.pet||es language-pack for Puppy Linux, for any Puppy built from Woof later than Feb. 28, 2012||||
 langpack_fr-20120315|langpack_fr|20120315||Setup|7584K||langpack_fr-20120315.pet||French language-pack for Puppy Linux, for any Puppy built from Woof later than Feb. 27, 2012. Created by esmourguit||||
 langpack_ru-20120318|langpack_ru|20120318||Setup|10000K||langpack_ru-20120318.pet||Russian language-pack for Puppy Linux, for any Puppy built from Woof later than Feb. 28, 2012||||
 lhp_sys_info-0.6|lhp_sys_info|0.6||System|156K||lhp_sys_info-0.6.pet||Hardware and Video Reporting Tool, created by tazoc||||
 linux_firewall-2.0rc9-puppy2|linux_firewall|2.0rc9-puppy2||Network|132K||linux_firewall-2.0rc9-puppy2.pet||Firewall||||