Check-in [4f789d3df9]
Not logged in

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

Overview

SHA1 Hash:4f789d3df9c35142135f89243033758f17a1c302
Date: 2012-05-05 13:40:43
User: BarryK
Comment:woof cross-build full-hd installation direct to sd card, not properly configured, /etc/rc.d/rc.update now does it

Tags And Properties
Changes

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

@@ -27,10 +27,11 @@
 #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.
+#120505 PUPMODE==2, need to consider situation of a full-hd install that is not pre-setup.
 
 #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
@@ -109,15 +110,55 @@
   else #precaution
    DEFAULT_DESK_ICONS="`ls -1 /usr/local/lib/X11/themes | tail -n 1`"
   fi
   #110826 not needed, now done in 3builddistro...
   #/usr/sbin/icon_switcher_cli $DEFAULT_DESK_ICONS
-  [ -f /usr/share/doc/woof-tree-official.svg ] && [ ! -f /usr/share/doc/woof-tree-official.png ] && rsvg-convert -w 648 -a -o /usr/share/doc/woof-tree-official.png /usr/share/doc/woof-tree-official.svg #100425
+  #[ -f /usr/share/doc/woof-tree-official.svg ] && [ ! -f /usr/share/doc/woof-tree-official.png ] && rsvg-convert -w 648 -a -o /usr/share/doc/woof-tree-official.png /usr/share/doc/woof-tree-official.svg #100425
   exit ###EXIT###
  ;;
  *) #v423 PUPMODE=2 (full hd install) then just exit.
-  exit
+  #exit
+  #120505 need to consider situation of a full-hd install that is not pre-setup, as would normally be done by 3builddistro in Woof and the Universal Installer.
+  #one exception is a cross-build in Woof. in such a situation /etc/networkmodules would not exist...
+  [ -f /etc/networkmodules ] && exit ###EXIT###
+  #code as per PUPMODE==5 above...
+  if [ -f /etc/rc.d/WOOFMERGEVARS ];then #111123 inserted by 3builddistro.
+. /etc/rc.d/WOOFMERGEVARS
+   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. 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
+  fi
+  NEWPVERSION="`grep '^DISTRO_VERSION' /etc/DISTRO_SPECS | cut -f 2 -d '=' | cut -f 2 -d '"' | cut -f 2 -d "'" | cut -f 1 -d ' '`" #110422
+  #w001 generate /etc/networkmodules...
+  echo -n " network-drivers-list" >/dev/console
+  /usr/sbin/updatenetmoduleslist.sh #creates /etc/networkmodules
+  #110119 just in case something missing (like svg loader)...
+  echo -n " pixbuf-loaders" >/dev/console
+  gdk-pixbuf-query-loaders > /etc/gtk-2.0/gdk-pixbuf.loaders
+  #110622 note, mageia1 requires above file to be at /usr/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache -- symlink created by 3builddistro.
+  #w002 update icon cache (supposed to speed things up)...
+  echo -n " gtk-icon-cache" >/dev/console
+  #note, can use  --ignore-theme-index if want to...
+  /usr/bin/gtk-update-icon-cache -f /usr/share/icons/hicolor/
+  #w002 generate desktop icons (previously done in unleashed)...
+  echo -n " desk-icons" >/dev/console
+  if [ -f /etc/desktop_icon_theme ];then #110119
+   DEFAULT_DESK_ICONS="`cat /etc/desktop_icon_theme`" #Woof creates this.
+  else #precaution
+   DEFAULT_DESK_ICONS="`ls -1 /usr/local/lib/X11/themes | tail -n 1`"
+  fi
+  #110826 not needed, now done in 3builddistro...
+  #/usr/sbin/icon_switcher_cli $DEFAULT_DESK_ICONS
+  exit ###EXIT###
  ;;
 esac
 
 . $NEWFILESMNTPT/etc/DISTRO_SPECS #w020 has DISTRO_VERSION, DISTRO_BINARY_COMPAT, DISTRO_FILE_PREFIX