Check-in [ad1e860d8c]
Not logged in

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

Overview

SHA1 Hash:ad1e860d8cf50e5d37f6a1bd2370e933ee017a13
Date: 2012-08-23 02:30:07
User: BarryK
Comment:rerwin: woof fixes, from rerwin_woof_fixes-delta-3a.pet, forum t=76961&start=255

Tags And Properties
Changes

Changes to woof-code/rootfs-skeleton/sbin/pup_event_backend_modprobe

@@ -11,10 +11,12 @@
 #110508 do not allow argument-module if it is blacklisted (note blacklist.conf created in rc.sysinit).
 #110508 modprobe -i to ignore "install" and "remove" commands in /etc/modprobe.d/*.conf.
 #110509 avoid chance of a module not getting loaded when almost-simultaneous 'add' uevents.
 #110516 no longer using setup_alsa_func. now using /etc/modprobe.d/alsa-base.conf (from Ubuntu) only.
 #111106 support firmware directories.
+#120823 rerwin: $FIRMPKG always written.
+#120823 rerwin: --use-blacklist to apply the blacklist commands in the configuration files (if any) to module names as well.
 
 export LANG=C
 . /etc/rc.d/PUPSTATE
 . /etc/rc.d/MODULESCONFIG
 
@@ -80,15 +82,15 @@
       [ $PINSTALLCNT -eq 1 ] && break
       usleep ${SLEEPU}0 #110509
       BRKCNT=$(($BRKCNT + 1))
       [ $BRKCNT -gt 5 ] && break
      done
-     echo "$FIRMPKG" >> /etc/modules/firmware.dep.inst.${KERNVER} #101202
      cd /
      /pinstall.${FIRMPKG}.sh >/dev/null 2>&1
      rm -f /pinstall.${FIRMPKG}.sh >/dev/null 2>&1
     fi
+    echo "$FIRMPKG" >> /etc/modules/firmware.dep.inst.${KERNVER} #101202 120823 moved.
    fi
   fi
  fi
 }
 
@@ -98,11 +100,12 @@
 #mREGEX='M='"$MODALIAS"' '
 #[ `cat /tmp/pup_event_backend/protect0-* | grep "$mREGEX" | wc -l` -gt 1 ] && exit
 
 #note, no longer using /tmp/pup_event_modprobe.conf (which was created in rc.sysinit)...
 #110508 -i to ignore "install" and "remove" commands in /etc/modprobe.d/*.conf...
-MODULE="`/sbin/modprobe -i --show-depends $MODALIAS 2>/dev/null | tail -n 1 | rev | cut -f 1 -d '/' | rev | cut -f 1 -d '.' | tr '\-' '_'`"
+#120823 rerwin: --use-blacklist (or -b) to apply the blacklist commands in the configuration files (if any) to module names as well...
+MODULE="`/sbin/modprobe -i --use-blacklist --show-depends $MODALIAS 2>/dev/null | tail -n 1 | rev | cut -f 1 -d '/' | rev | cut -f 1 -d '.' | tr '\-' '_'`"
 if [ "$RULEMODULE" != "" ];then
  if [ "$MODULE" = "" -o "$MODULE" = "usb_storage" -o "$MODULE" = "snd_hda_intel" ];then
   #110508 do not allow argument-module if it is blacklisted (note blacklist.conf created in rc.sysinit)...
   [ "`cat /etc/modprobe.d/blacklist*.conf | grep -w "${RULEMODULE}"`" = "" ] && MODULE="$RULEMODULE" #101121 rerwin: Use module from argument
  fi

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

@@ -17,10 +17,12 @@
 #101206 pupdial_wizard_helper now called from pupdial.
 #111022 added hostname-set button.
 #111028 put hostname entry box directly in this wizard. internationalised.
 #111106 do not use $HOSTNAME, as hostname-set may have just been run.
 #120201 one gettext translation added.
+#120823 rerwin: add frisbee.
+#120823 rerwin: get correct pid in wait loop.
 
 export TEXTDOMAIN=connectwizard
 export OUTPUT_CHARSET=UTF-8
 
 GTKDIALOGEXE="gtkdialog"
@@ -36,10 +38,11 @@
 DEFRPPPPOE="no"
 DEFMTGPRS="no"
 DEFICW="no"
 DEFPPPOECONF="no" #v409
 DEFPWIRELESS="no" #100227
+DEFFRISBEE="no" #120823
 DEFNETWIZCLASSIC="no" #100227
 DEFNETWIZARD="no" #100227
 DEFSNS="no" #100310
 case $DEFAULTCONNECT in
  gnome-ppp)
@@ -58,10 +61,13 @@
   DEFPPPOECONF="yes"
   ;;
  Pwireless2) #100227
   DEFPWIRELESS="yes"
   ;;
+ Frisbee) #120823
+  DEFFRISBEE="yes"
+  ;;
  net_wiz_classic) #100227
   DEFNETWIZCLASSIC="yes"
   ;;
  net-setup.sh) #100227
   DEFNETWIZARD="yes"
@@ -77,11 +83,11 @@
 #101002 rerwin: Wait for initialization scripts to complete... 101122 breakout.
 BRKCNT=0 ; BRKPID=0
 while [ "`ps aux | grep 'rc.services' | grep -v 'grep'`" != "" ];do
  if [ $BRKCNT -eq 1 ];then
   yaf-splash -bg orange -placement center -close never -fontsize large -text "Please wait..." &
-  BRKPID=$?
+  BRKPID=$! #120823
  fi
  sleep 1
  BRKCNT=$(($BRKCNT + 1))
  [ $BRKCNT -gt 10 ] && break
 done
@@ -196,10 +202,15 @@
 M_pw1=$(gettext "Pwireless (wireless networking)")
 if [ -d /usr/local/Pwireless2 ];then #100227 Jemimah's wireless connection gui.
  FLAGPWIRELESS="<radiobutton><label>${M_pw1}</label><variable>RADIOPWIRELESS</variable><default>$DEFPWIRELESS</default></radiobutton>"
 fi
 
+M_fr1=$(gettext "Frisbee (wireless networking)")
+if [ -f /usr/local/Frisbee/func ];then #100227 Jemimah's wireless connection gui.
+ FLAGFRISBEE="<radiobutton><label>${M_fr1}</label><variable>RADIOFRISBEE</variable><default>$DEFFRISBEE</default></radiobutton>"
+fi
+
 M_nwc1=$(gettext "Network Wizard Classic")
 if [ -f /usr/local/net_setup/usr/sbin/net-setup.sh ];then #100227 wizard used in older puppies.
  FLAGNETWIZCLASSIC="<radiobutton><label>${M_nwc1}</label><variable>RADIONETWIZCLASSIC</variable><default>$DEFNETWIZCLASSIC</default></radiobutton>"
 fi
 
@@ -225,10 +236,11 @@
    <radiobutton><label>${M_md1}</label><variable>RADIOPUPDIAL</variable><default>$DEFPUPDIAL</default></radiobutton>
    $FLAGPPPOECONF
    $FLAGROARINGPENGUIN
    $FLAGMTGPRS
    $FLAGPWIRELESS
+   $FLAGFRISBEE
    $FLAGNETWIZCLASSIC
    $FLAGNETWIZARD
    $FLAGSNS
    <radiobutton><label>${M_icw1}</label><variable>RADIOICW</variable><default>$DEFICW</default></radiobutton>
   </vbox>
@@ -363,10 +375,11 @@
 [ "$RADIOBUT" = "RADIORPPPPOE" ] && echo -e '#!/bin/sh\nexec pppoe_gui' > /usr/local/bin/defaultconnect
 [ "$RADIOBUT" = "RADIOMTGPRS" ] && echo -e '#!/bin/sh\nexec rxvt -title "pgprs-connect PRESS CTRL+C TO DISCONNECT" -e pgprs-connect' > /usr/local/bin/defaultconnect
 [ "$RADIOBUT" = "RADIOICW" ] && echo -e '#!/bin/sh\nexec connectwizard' > /usr/local/bin/defaultconnect
 [ "$RADIOBUT" = "RADIOPPPOECONF" ] && echo -e '#!/bin/sh\nexec pppoeconf' > /usr/local/bin/defaultconnect #v409
 [ "$RADIOBUT" = "RADIOPWIRELESS" ] && echo -e '#!/bin/sh\nexec Pwireless2' > /usr/local/bin/defaultconnect #100227
+[ "$RADIOBUT" = "RADIOFRISBEE" ] && echo -e '#!/bin/sh\nexec Frisbee' > /usr/local/bin/defaultconnect #120823
 [ "$RADIOBUT" = "RADIONETWIZCLASSIC" ] && echo -e '#!/bin/sh\nexec net_wiz_classic' > /usr/local/bin/defaultconnect #100227
 [ "$RADIOBUT" = "RADIONETWIZARD" ] && echo -e '#!/bin/sh\nexec net-setup.sh' > /usr/local/bin/defaultconnect #100227
 [ "$RADIOBUT" = "RADIOSNS" ] && echo -e '#!/bin/sh\nexec sns' > /usr/local/bin/defaultconnect #100227
 
 ###end###

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

@@ -46,10 +46,12 @@
 #120403 removed adobe flash download. no, have changed to older version.
 #120620 removed adobe flash download. want quicksetup/welcome1stboot for any PUPMODE at first startup.
 #120708 run 'quickarm' instead of 'quicksetup' on arm boards. see 3builddistro, /usr/sbin/quicksetup.
 #120714 revert 120708.
 #120718 modify initial sleep.
+#120823 rerwin: skip quicksetup if /etc/personal_settings_popup_disabled file created by remasterpup2 (modified by rerwin).
+#120823 rerwin: use distro-specific delayedrun if available.
 
 [ "`whoami`" != "root" ] && exec sudo -A ${0} ${@} #120110
 
 export TEXTDOMAIN=delayedrun
 export OUTPUT_CHARSET=UTF-8
@@ -56,10 +58,11 @@
 . gettext.sh
 
 #variables created at bootup by 'init' in initramfs...
 . /etc/rc.d/PUPSTATE
 . /etc/DISTRO_SPECS
+[ -x ${0}-${DISTRO_FILE_PREFIX} ] && exec ${0}-${DISTRO_FILE_PREFIX} #120823 rerwin: use distro-specific delayedrun if available.
 . /etc/rc.d/BOOTCONSTRAINED #120708
 
 BGOPT=""
 #100821 start...
 WINDOWMANAGER="`cat /etc/windowmanager`"
@@ -136,11 +139,11 @@
   touch /var/local/delayedrun_firstboot_flag
   if [ "$DISTRO_XORG_AUTO" = "yes" ];then #see /etc/DISTRO_SPECS 111019
    #quick setup window for country and language and X resolution...
    QUICKSETUP="quicksetup"
    [ "`readlink /usr/bin/X | grep 'Xorg'`" = "" ] && QUICKSETUP="quickcountry" #probably Xvesa, offer country settings only.
-   ${QUICKSETUP}
+   [ ! -f /etc/personal_settings_popup_disabled ] && ${QUICKSETUP} #120823 rerwin: skip quicksetup if /etc/personal_settings_popup_disabled file created by remasterpup2 (modified by rerwin).
   fi
   if [ -c /dev/mixer ];then #110113 test for sound ready, see /etc/init.d/10alsa.
    aplay /usr/share/audio/2barks.au &
    #wavplay /usr/share/audio/2barks.wav &
    RETAPLAY=$?

Changes to woof-distro/x86/ubuntu/precise/DISTRO_PKGS_SPECS-ubuntu-precise

@@ -93,11 +93,12 @@
 no|coreutils||exe
 yes|cmake|cmake,cmake-data|exe>dev,dev,doc,nls
 yes|cpio|cpio|exe,dev>null,doc,nls
 no|cpu-scaling-ondemand||exe| #no, using wcpufreq instead.
 yes|ctorrent|ctorrent|exe,dev>null,doc,nls
-yes|cups|cups-1.3.11*|exe,dev,doc,nls|pet:wary5| #stupid ubuntu cups is broken.
+no|cups|cups-1.3.11*|exe,dev,doc,nls|pet:wary5| #stupid ubuntu cups is broken.
+yes|cups|cups-1.4*,cups_DEV-1.4*|exe,dev,doc,nls|pet:wary5
 no|cups|cups-bsd,cups,cups-common,cups-client,cups-ppdc,libcups2,libcups2-dev,libcupsimage2,libcupsimage2-dev,libcupsmime1,libcupsmime1-dev,libcupscgi1,libcupscgi1-dev,libcupsdriver1,libcupsdriver1-dev,libcupsppdc1,libcupsppdc1-dev|exe,dev,doc>exe,nls
 no|cups-filters|cups-filters,libcupsfilters1,libcupsfilters-dev|exe,dev,doc,nls| #extra cups filters, especially pdftops.
 yes|cups_pdf||exe
 no|cups-fix||exe
 yes|curl|curl,libcurl3,libcurl4-openssl-dev|exe,dev,doc,nls