slacko-6.0 beta 2

[zigbert]

Mick
Can you delete /usr/share/ptheme in Woof-CE. The pDesktop package should control this....

There is also a 'pthemes' dir in rootfs-packages which is empty.


Thank you
Sigmund

[zigbert]

@Zigbert: if ptheme was launched for the first time as user root, it creates and leaves some files @ /tmp/ptheme/ dir.
Since /tmp has sticky bit set, it's not possible to launch ptheme as user spot after that.

If we go multiuser, there is several things to grab. For now, I think root is just fine.


Sigmund

[Jades]

Any more thoughts on the problem with parallel port printing? If you need any other tests or reports just let me know.

[shinobar]

Thanks for the test.

1. PM=12
All seems to be ok, only .wh files related to given SFS are deleted.

2. PM=13, SI=0
Ok if .wh files are in pup_rw, but if session has been saved and .wh files are in pup_ro1, they aren't deleted.
From what I've seen in the code this is desired behavior..?

Yes. RAMSAVEINTERVAL=0 means the savelayer pup_ro1 cannot be touched. Any idea?

3. PM=13, SI>0
Same as No.2, but it's because of a slight bug in line 1195:

Code: Select all

$MYTMPDIR/cleanup /initrd/$SLAYER $PARAM

SLAYER already has leading / so we get /initrd//pup_ro1, hence /tmp/sfs_load/cleanup won't recognize it correctly.
Works as expected if:

Code: Select all

$MYTMPDIR/cleanup /initrd$SLAYER $PARAM

Oops Thanks for the fix.

[01micko]

Any more thoughts on the problem with parallel port printing? If you need any other tests or reports just let me know.

It is a bit perplexing for me, I'm no printer expert. I have tried to source a working parallel printer to no avail.

Try to PM rcrsn51.

Just some thoughts. Check permissions on /dev/ppdev/lp0 (or whatever the device node is) .. mine on /dev/usb/lp0 are crw-rw---- 1 root lp 180, 0 Jul 9 09:32 lp0

Also, an output of the CUPS error log may be useful.

----------------------------------------------------------------------------------------------

Any more reports on universal installer? I only have Billtoo and SFR.. plus vicmz showed some interest but no report. I guess it's working pretty good then eh?

----------------------------------------------------------------------------------------------

shinobar

I offered a patch for grub4dosconfig here regarding woof-CE icons that is backward compatible. I have one for frugal installer too, however I want to write a generic pinstall.sh so packagers can make apps that are compatible with old woof builds and woof-CE builds to fix up DOT desktop files.

Code: Select all

diff -rup frugalinstaller-1.5/usr/sbin/frugalinstaller frugalinstaller-1.5-1/usr/sbin/frugalinstaller
--- frugalinstaller-1.5/usr/sbin/frugalinstaller	2012-02-03 21:09:06.000000000 +1000
+++ frugalinstaller-1.5-1/usr/sbin/frugalinstaller	2014-07-09 09:44:48.553256837 +1000
@@ -30,7 +30,6 @@ else
   }
 fi
 TITLE="Frugal Installer v.$VERSION"
-ICONS="/usr/local/lib/X11/mini-icons"
 PUPSAVECONF="/etc/rc.d/pupsave.conf"
 LOGFILE=/tmp/$(basename $0).log
 COUNTFILE=/tmp/$(basename $0).count
@@ -110,9 +109,14 @@ waitsplash() {
   fi
   shift	# remove $1
   S=$(gettext "Wait a moment ...")
+  if [ -d "/usr/share/pixmaps/puppy" ];then
+    pixmapclock='<pixmap><input file>/usr/share/pixmaps/puppy/clock.svg</input><width>16</width></pixmap>'
+  else
+    pixmapclock='<pixmap><input file>$ICONS/mini-clock.xpm</input></pixmap>'
+  fi
   DIALOG="<window title="$TITLE"><vbox>
   <hbox>
-  <pixmap><input file>$ICONS/mini-clock.xpm</input></pixmap>
+    $pixmapclock
   <text><input>echo -e -n "$* $S"</input></text>
   </hbox>
   $PBAR

Note: there was 2 entries for ICONS= the same.

[Jades]

Any more thoughts on the problem with parallel port printing? If you need any other tests or reports just let me know.

It is a bit perplexing for me, I'm no printer expert. I have tried to source a working parallel printer to no avail.

The device for the parallel port appears to be missing entirely, printer attached or not. This isn't a case of the printer being set up in CUPS and it then not working, it and the actual port have become invisible.

Issuing a modprobe for ppdev makes parport0 show up in /dev on 32-Bit 593 but not on 64-Bit 591 (the latter erroring, see other thread). CUPS still couldn't see it.

The weird thing is that you can see from dmesg that the OS sees the printer during booting, but then it can't later on. Will check the other stuff tomorrow, way past bedtime.

I should say that the printing issue aside I've found 593 to be a very promising version.

Edit - correct version number typo. Time for bed.

[shinobar]

@01mico, Thanks for the pui-experimental2.

Tested full install. It needed some patch.
1. Some Windows 7/8 has a small(100-200MB) partition for boot. I don't know about recovery partitions.
2. SRCPATH may have multiple lines which shall mess up.
3. 'Please wait...' message disappears while installing. Need infinity timeout.
4. vmlinuz should be installed before the grub4dos invoked.
5. I think need some check while installation failed.

Code: Select all

--- puppyinstaller-z   2014-07-07 09:10:56.000000000 +0900
+++ puppyinstaller   2014-07-09 15:00:38.629789382 +0900
@@ -194,18 +194,21 @@
        echo $ISPUPMNTPT
        DISTROW=''
        WINSTALL=`find "$ISPUPMNTPT" -type d -maxdepth 1 -iname 'windows' 2>/dev/null`
-       if [ "$WINSTALL" != "" ];then
          ANCW=`find "$ISPUPMNTPT" -type f -maxdepth 2 -name AUTOEXEC.BAT 2>/dev/null`
          OLDW=`find "$ISPUPMNTPT" -type f -maxdepth 2 -name boot.ini 2>/dev/null`
          MEDW=`find "$ISPUPMNTPT" -type f -maxdepth 2 -name 'BCD' 2>/dev/null`
          NEWW=`find "$ISPUPMNTPT" -type d -maxdepth 3 -name 'EFI' 2>/dev/null` # windows server 2008 is 3 deep
          SIXTY4W=`find "$ISPUPMNTPT"/Windows -type d -maxdepth 2 -name 'SysWOW64' 2>/dev/null`
+       if [ "$WINSTALL" != "" ];then
          if [ "$ANCW" != "" ];then DISTROW="Ancient Windows"
             [ "$OLDW" != "" ] && DISTROW="Old Windows"
          elif [ "$MEDW" != "" ] || [ "$NEWW" != "" ];then DISTROW="Older Windows"
            [ "$NEWW" != "" ] && DISTROW="New Windows"
            [ "$SIXTY4W" != "" ] && DISTROW="Windows 64 bit"
          fi
+       elif  [ "$MEDW" != "" ] || [ "$NEWW" != "" ];then
+           DISTROW="Windows boot"
+           [ "$NEWW" != "" ] && DISTROW="New Windows boot"
        else
          DISTROW=""
        fi
@@ -434,8 +437,10 @@
   SRCPATH="`dirname $SRCFPATH`"
  fi
 fi
+SRCPATH=`echo "${SRCPATH}" | head -n 1`
 #sanity check...
 if [ ! -f ${SRCPATH}/${DISTRO_PUPPYSFS} ];then #v3.01 v424 100913
+ [ "$SRCPATH" = "/mnt/$CDDRIVE" ] && eject /dev/$CDDRIVE
  Xdialog --wmclass "gtkdialog2" --left \
  --title "$(gettext 'Puppy universal installer: ERROR')" \
  --msgbox "`eval_gettext \"Oh dear, a 'sanity check' has failed.\
@@ -460,6 +465,20 @@
      *)echo "no" ;;
    esac
 }
+fatal() {
+   [ $XPID ] && kill $XPID
+   MSG=$(gettext "Failed to copy files.")
+   export FATAL='<window title="'$(gettext 'Puppy Universal Installer: ERROR')'"><vbox>
+   <hbox>
+       <pixmap  icon_size="6"><input file stock="gtk-dialog-error"></input></pixmap>
+     <text><label>"'$MSG'"</label></text>
+   </hbox>
+   <hbox><button ok></button></hbox>
+   </vbox></window>'
+   gtkdialog -c -p FATAL
+   unmountcdfunc
+   exit 1
+}
 
 # gui
 [ -s $HOME/.config/ptheme/gtkdialog_active ] && . $HOME/.config/ptheme/gtkdialog_active
@@ -1968,7 +1987,7 @@
     eval $(gtkdialog -p maingui)
     [ "$EXIT" = "abort" ] && EXIT=255   
     [ "$EXIT" = "Cancel" ] && EXIT=255
-    [ "$EXIT" = "OK" ] && EXIT=69
+    [ "$EXIT" = "OK" ] && EXIT=1
     RET_VAL="$EXIT"
     if [ $RET_VAL -eq 255 ];then
      echo "bailing"
@@ -1979,9 +1998,7 @@
     fi
     if [ $RET_VAL -eq 1 ];then #no
      echo "wiping"
-     Xdialog --wmclass "gtkdialog2" --title "$(gettext 'Puppy Universal Installer')" \
-     --no-buttons \
-     --infobox "$(gettext 'Please wait, wiping all files in') $DESTPART..." 0 0 200000 &
+     yaf-splash -close never -bg orange -text "$(gettext 'Please wait, wiping all files in') $DESTPART..." &
      XPID=$!
      sleep 3
      rm -rf $DESTMNTPT/*
@@ -1992,9 +2009,7 @@
     fi
    #fi
    echo "installing"
-   Xdialog --wmclass "gtkdialog2" \
-   --title "$(gettext 'Puppy Universal Installer')" --no-buttons \
-   --infobox "$(gettext 'Please wait, copying Puppy files to') $DESTPART..." 0 0 120000 &
+   yaf-splash -close never -bg orange -text "$(gettext 'Please wait, copying Puppy files to') $DESTPART..." &
    XPID=$!
    sleep 1
    cp -f /etc/profile /tmp/profile-before_upgrade #120823 rerwin: preserve user-modified files in full-install upgrade.
@@ -2003,9 +2018,9 @@
    mkdir "$DESTMNTPT"/srcmntpt
    mount -r -t squashfs /dev/loop2 $DESTMNTPT/srcmntpt
    for dir in bin dev etc lib lib64 mnt opt proc root sbin tmp usr var ; do
-     [ -d "$DESTMNTPT"/srcmntpt/"$dir" ] && \
+     [ -d "$DESTMNTPT"/srcmntpt/"$dir" ] || continue
      cp -a -u --remove-destination "$DESTMNTPT"/srcmntpt/"$dir" "$DESTMNTPT"/ \
-     || continue
+     || fatal
    done #140630
    sync
    #130613 puppy currently has /run a symlink to /tmp, but don't assume this always. create as-is...
@@ -2064,7 +2079,7 @@
    #fix space optimisation links into initrd...
     #TODO
    #chroot to DESTPART, set DISTRO_VERSION back to $PUPVEROLD, run rc.update
-   Xdialog --wmclass "gtkdialog2" --title "$(gettext 'Puppy Universal Installer')" --no-buttons --infobox "$(gettext 'Please wait, executing rc.update script...')" 0 0 60000 &
+   yaf-splash -bg orange -text "$(gettext 'Please wait, executing rc.update script...')" &
    XPID=$!
    sleep 2
   
@@ -2105,6 +2120,10 @@
   #140707
   type grub4dosconfig
   if [ "$?" = 0 ];then
+    mkdir -p /mnt/$DESTPART/boot
+    cp -p --remove-destination $SRCPATH/vmlinuz /mnt/$DESTPART/boot/
+    sync
+    umount /mnt/$DESTPART
     unmountcdfunc
     grub4dos_func
   fi
@@ -2115,11 +2134,6 @@
 
    #091210 simpler stuff for grub4dos...
    if [ -f /usr/sbin/grub4dosconfig ];then
-    mkdir -p /mnt/$DESTPART/boot/grub
-    cp -af $SRCPATH/vmlinuz /mnt/$DESTPART/boot/
-    sync
-    umount /mnt/$DESTPART
-    unmountcdfunc
     echo "
 `gettext \"If you have GRUB installed, find the 'menu.lst' file (usually in /boot
 in the partition in which GRUB is installed) and insert the text,	

[shinobar]

The GUI choosing the partition breaks in some translation.
The choose buttons are hidden in the horizontal scroll.

[zigbert]

There is a minor issue with the Puppy universal installer when no ptheme is set.
The color of the vertical text have too low contrast compared to the default bright theme. I would switch the textcolor and the background color.

Code: Select all

432,433c432,433
< [ ! "$SVG_BAR_COLOR_TOTAL" ] && SVG_BAR_COLOR_TOTAL='#111'
< [ ! "$SVG_BAR_COLOR_TEXT" ] && SVG_BAR_COLOR_TEXT='#eee' #background color
---
> [ ! "$SVG_BAR_COLOR_TOTAL" ] && SVG_BAR_COLOR_TOTAL='#eee'
> [ ! "$SVG_BAR_COLOR_TEXT" ] && SVG_BAR_COLOR_TEXT='#111' #background color

from



to



If we shall be finicky, the scalegrip in the gui is overkill. There is nothing that needs to be enlarged. And, the frame in most Woof-guis is dragged down below the heading. Like this...



The gui-code (line 431-570)

Code: Select all

[ -s $HOME/.config/ptheme/gtkdialog_active ] && . $HOME/.config/ptheme/gtkdialog_active
[ ! "$SVG_BAR_COLOR_TOTAL" ] && SVG_BAR_COLOR_TOTAL='#111'
[ ! "$SVG_BAR_COLOR_TEXT" ] && SVG_BAR_COLOR_TEXT='#eee' #background color

export PUI='
<window title="'$(gettext 'Puppy Universal Installer')'" icon-name="gtk-preferences">
<vbox>
  '"`/usr/lib/gtkdialog/xml_info 0 puppy_install.svg 60 "$(gettext "If you wish to install Puppy to a removable media, such as a USB Flash or hard drive or CD/DVD disc, <b>please insert it right now</b>, before proceeding. Then, choose the media that you want to install Puppy to.")"`"'
  <frame '$(gettext 'Puppy Universal Installer')'>
    <hbox space-expand="true" space-fill="true">
      <eventbox name="bg" above-child="false" visible-window="true" space-expand="false" space-fill="false">
        <hbox space-expand="false" space-fill="false">
          <vbox margin="5">
            <text angle="90" wrap="false" use-markup="true" yalign="0.5" space-expand="true" space-fill="true"><label>"<big><big><span fgcolor='"'$SVG_BAR_COLOR_TEXT'"'><b>USB</b></span></big></big>"</label></text>
          </vbox>
        </hbox>
      </eventbox>
      <vbox>
        <hbox space-expand="true" space-fill="true">
          <text xalign="0" use-markup="true" space-expand="true" space-fill="true"><label>"<b>USB</b> '$(gettext 'Flash drive')'"</label></text>
          <vbox space-expand="false" space-fill="false">
            <button>
              '"`/usr/lib/gtkdialog/xml_button-icon flashcard_usb.svg big`"'
              <action type="exit">usbflash</action>
            </button>
          </vbox>
        </hbox>
        <hbox space-expand="true" space-fill="true">
          <text xalign="0" use-markup="true" space-expand="true" space-fill="true"><label>"<b>USB</b> '$(gettext 'hard drive')'"</label></text>
          <vbox space-expand="false" space-fill="false">
            <button>
              '"`/usr/lib/gtkdialog/xml_button-icon harddisk_usb.svg big`"'
              <action type="exit">usbhd</action>
            </button>
          </vbox>
        </hbox>
        <hbox space-expand="true" space-fill="true">
          <text xalign="0" use-markup="true" space-expand="true" space-fill="true"><label>"<b>USB</b> '$(gettext "CF Flash drive, later move CF card to IDE/SATA \
internal adaptor")'"</label></text>
          <vbox space-expand="false" space-fill="false">
            <button>
              '"`/usr/lib/gtkdialog/xml_button-icon flashcard_usb_2.svg big`"'
              <action type="exit">usb2ataflash</action>
            </button>
          </vbox>
        </hbox>
      </vbox>
    </hbox>

    <hseparator></hseparator>

    <hbox space-expand="true" space-fill="true">
      <eventbox name="bg" above-child="false" visible-window="true" space-expand="false" space-fill="false">
        <hbox space-expand="false" space-fill="false">
          <vbox margin="5">
            <text angle="90" wrap="false" use-markup="true" yalign="0.5" space-expand="true" space-fill="true"><label>"<big><big><span fgcolor='"'$SVG_BAR_COLOR_TEXT'"'><b>'$(gettext 'Internal')'</b></span></big></big>"</label></text>
          </vbox>
        </hbox>
      </eventbox>
      <vbox>
        <hbox space-expand="true" space-fill="true">
          <text xalign="0" use-markup="true" space-expand="true" space-fill="true"><label>"'$(gettext '<b>Internal</b> (IDE or SATA) hard drive')'"</label></text>
          <vbox space-expand="false" space-fill="false">
            <button>
              '"`/usr/lib/gtkdialog/xml_button-icon harddisk.svg big`"'
              <action type="exit">atahd</action>
            </button>
          </vbox>
        </hbox>
        <hbox space-expand="true" space-fill="true">
          <text xalign="0" use-markup="true" space-expand="true" space-fill="true"><label>"'$(gettext '<b>Internal</b> IDE/SATA Flash drive
(ex: CF card, SD memory card)')'"</label></text>
          <vbox space-expand="false" space-fill="false">
            <button>
              '"`/usr/lib/gtkdialog/xml_button-icon flashcard.svg big`"'
              <action type="exit">ataflash</action>
            </button>
          </vbox>
        </hbox>
        <hbox space-expand="true" space-fill="true">
          <text xalign="0" use-markup="true" space-expand="true" space-fill="true"><label>"'$(gettext '<b>Internal</b> USB Flash drive (ex: uDiskOnChip)')'"</label></text>
          <vbox space-expand="false" space-fill="false">
            <button>
              '"`/usr/lib/gtkdialog/xml_button-icon card_usb.svg big`"'
              <action type="exit">iusbflash</action>
            </button>
          </vbox>
        </hbox>
        <hbox space-expand="true" space-fill="true">
          <text xalign="0" use-markup="true" space-expand="true" space-fill="true"><label>"'$(gettext 'Ancient true-SCSI hard drive')'"</label></text>
          <vbox space-expand="false" space-fill="false">
            <button>
              '"`/usr/lib/gtkdialog/xml_button-icon harddisk_scsi.svg big`"'
              <action type="exit">scsihd</action>
            </button>
          </vbox>
        </hbox>
      </vbox>
    </hbox>

    <hseparator></hseparator>

    <hbox space-expand="true" space-fill="true">
      <eventbox name="bg" above-child="false" visible-window="true" space-expand="false" space-fill="false">
        <hbox space-expand="false" space-fill="false">
          <vbox margin="5">
            <text angle="90" wrap="false" use-markup="true" yalign="0.5" space-expand="true" space-fill="true"><label>"<big><big><span fgcolor='"'$SVG_BAR_COLOR_TEXT'"'><b>CD</b></span></big></big>"</label></text>
          </vbox>
        </hbox>
      </eventbox>
      <vbox>
        <hbox space-expand="true" space-fill="true">
          <text xalign="0" use-markup="true" space-expand="true" space-fill="true"><label>"'$(gettext '<b>Optical</b> drive (CD/DVD/BD)')'"</label></text>
          <vbox space-expand="false" space-fill="false">
            <button>
              '"`/usr/lib/gtkdialog/xml_button-icon cdrom.svg big`"'
              <action type="exit">cd</action>
            </button>
          </vbox>
        </hbox>
      </vbox>
    </hbox>
  </frame>
  <hbox space-expand="false" space-fill="false">
    <button>
      '"`/usr/lib/gtkdialog/xml_button-icon quit`"'
      <label>'$(gettext 'Quit')'</label>
      <action type="exit">EXIT</action>
    </button>
  </hbox>
</vbox>
</window>'

echo '
style "bg" { bg [NORMAL] = "'$SVG_BAR_COLOR_TOTAL'" }
widget "*bg*" style "bg"' > /tmp/gtkrc_pui
export GTK2_RC_FILES=/tmp/gtkrc_pui:/root/.gtkrc-2.0

. /usr/lib/gtkdialog/xml_info gtk #build bg_pixmap for gtk-theme
RETVAL="`gtkdialog -p PUI 2>/dev/null`"

[01micko]

Thanks shinobar for the patch and the report.

I might be able to widen that box where the buttons go.

Thanks ziggy for your improvements. I'll add them.

[SFR]

Yes. RAMSAVEINTERVAL=0 means the savelayer pup_ro1 cannot be touched. Any idea?

Hmm, ok.
Yes, but this is only a half-solution, though I think it's better than none-solution.
Idea is simple: if PM=13 & SI=0, cleanup script, instead of deleting whiteouts from pup_ro1, should create anti-whiteouts in pup_rw (since can't be created directly in top layer).
So, pup_ro1 remains untouched, unless a user decides to save the session.

Example of what I mean:
1. Delete /root/puppy-reference dir.
2. Save session - /initrd/pup_ro1/root/.wh.puppy-refrerence appears
3. touch /initrd/pup_rw/root/.wh..wh.puppy-reference
4. Save session - /initrd/pup_ro1/root/.wh.puppy-reference gets deleted and /root/puppy-reference comes back.

What do you think of it?

Greetings!

[mavrothal]

Example of what I mean:
1. Delete /root/puppy-reference dir.
2. Save session - /initrd/pup_ro1/root/.wh.puppy-refrerence appears
3. touch /initrd/pup_rw/root/.wh..wh.puppy-reference
4. Save session - /initrd/pup_ro1/root/.wh.puppy-reference gets deleted and /root/puppy-reference comes back.

Can you delete /root/puppy-reference again after that?

[SFR]

Can you delete /root/puppy-reference again after that?

Yes, I can. Have you experienced the opposite behaviour?

Yes, but not in the exact setting (hopefully I'll test latter)

Hmm, this may not work properly with older snapmergepuppy versions, which have not busybox mount -t aufs -o remount,udba=reval unionfs / implemented.

Greetings!

[mavrothal]

Can you delete /root/puppy-reference again after that?

Yes, I can. Have you experienced the opposite behaviour?

Yes, but not in the exact setting (hopefully I'll test latter)

[01micko]

PUI again

-patch from shinobar applied
-changes suggested by zigbert
-attempt to widen the gui

I widened it and shortened the height and hopefully there is no scrollbars until necessary (more than 6 partitions) . Translators may have to fit some stings under a certain amount of chars- this only for single line dialogs, see the "CAUTION: ,,,", "Check this box ....", "Here is what puppy has found.." strings. Also, I'm not sure on the limit of "Install puppy to (whatever_drive):" so experimentation is in order.

Test please.

New attachment next page.

[shinobar]

PUI again

-patch from shinobar applied
-changes suggested by zigbert
-attempt to widen the gui

Thanks.
Tested only a full install on internal HDD.
Working so far.

[SFR]

PUI again

Alright, here's how it looks like on my box now.

Greetings!

[zigbert]

Line 943 required at least h=75 to get correct view without scrollbars. Thinking of increasing global fontsize, maybe 100 should be a minimum?

Nice to see that you have improved the gui further. Like it



And, if bothering, here is a quit-button, and help-buttons aligned at bottom

[01micko]

Ok, thanks ziggy, I'll apply those and I'll go back to 1|2)h=80 ;;

I did find a bug.. missing ';;' in the case in the gui_func. *)installmessage="$message" ;;

Also, disktype utility does not support f2fs filesystem, no patch found as yet, and it's too low level for me to tinker with , so I'm hunting for a work around.. then it should be pretty close to finished.

Thanks for reports.

[01micko]

Hopefully the last of PUI for a while.

- added ziggy's dotpup change
- bug fix for the cd bug and scrollbar
- work around for f2fs and added function to detect if f2fs-usb-installer is installed and if so run it (if you click the button )
- also greyed out the small boot partition on f2fs drives (on condition it is less than 100MB)

It all looks pretty much the same so no need of a screeny. I've tested the f2fs part and also a frugal to ntfs and the cd detetcion; all working as expected (for me, hope so for you)