(OLD) (ARCHIVED) Puppy Linux Discussion Forum Forum Index (OLD) (ARCHIVED) Puppy Linux Discussion Forum
Puppy HOME page : puppylinux.com
"THE" alternative forum : puppylinux.info

This forum can also be accessed as http://oldforum.puppylinux.com
It is now read-only and serves only as archives.

Please register over the NEW forum
https://forum.puppylinux.com
and continue your work there. Thank you.

 
 FAQFAQ   SearchSearch   MemberlistMemberlist   UsergroupsUsergroups    
 ProfileProfile   Log in to check your private messagesLog in to check your private messages   Log inLog in 

The time now is Sun 27 Sep 2020, 00:15
All times are UTC - 4
 Forum index » Advanced Topics » Cutting edge
Enhance boot params, pupsfs, zdrv, fdrv, adrv, ydrv, psave
Moderators: Flash, Ian, JohnMurga
This forum is locked: you cannot post, reply to, or edit topics.   This topic is locked: you cannot edit posts or make replies. View previous topic :: View next topic
Page 3 of 4 [60 Posts]   Goto page: Previous 1, 2, 3, 4 Next
Author Message
gyro

Joined: 28 Oct 2008
Posts: 1799
Location: Brisbane, Australia

PostPosted: Mon 30 May 2016, 13:49    Post subject:  

@jlst,

I have attached a patch to the "init" in the previous post.
This version fails more gracefully if you misspell the filename when specifying an sfs file.

gyro
fix2-initrd_progs.diff.gz
Description  gunzip to produce "fix2-initrd_progs.diff", then "patch" "init" with it.
gz

 Download 
Filename  fix2-initrd_progs.diff.gz 
Filesize  526 Bytes 
Downloaded  233 Time(s) 
Back to top
View user's profile Send private message 
gyro

Joined: 28 Oct 2008
Posts: 1799
Location: Brisbane, Australia

PostPosted: Tue 31 May 2016, 02:50    Post subject: Updated to a notional version 3.  

Please see the first post for downloads for this version.

It fixes a problem where specified sfs files were not found if they resided on a partition that did not contain a PSUBDIR directory.

Also properly implements the following preference when looking for sfs files:
1) Specified partition + specified filename
2) Specified partition + default filename
3) Default partition + default filename

The code changes are in the 2search-woof.diff patch, but I have updated the following patches to fix the line numbers.

gyro
Back to top
View user's profile Send private message 
gyro

Joined: 28 Oct 2008
Posts: 1799
Location: Brisbane, Australia

PostPosted: Tue 31 May 2016, 03:10    Post subject: initrd_progs problem  

@initrd_progs project folk, we have a problem.

My "1func-woof2.diff" fails to apply to your "init".
The problem is your patch to remove "umntfunc()".
Some of the lines changed by your patch fall within the significant slabs of code that my "1func-woof2.diff" attempts to delete, so the old version of the code fails to match.
And some of my inserted code requires appropriate changing.

A number of ways forward to avoid later conflicts:
1) I could create a commit and pull-request to "woof-CE/woof-code/huge_extras/init" "testing" with a "remove umntfunc" patch based on your "init".
2) You could merge your "remove umntfunc" patch with "woof-CE/woof-code/huge_extras/init" "testing".
3) My patches get merged into "initrd_progs" "init" rather that "woof-CE/woof-code/huge_extras/init".
In this case I would want to have my individual patches retained as separate commits. To facilate this I could provide them as individual patches against "init_progs" "init".

Any thoughts?

gyro
Back to top
View user's profile Send private message 
gyro

Joined: 28 Oct 2008
Posts: 1799
Location: Brisbane, Australia

PostPosted: Tue 31 May 2016, 05:13    Post subject: initrd_progs patches  

Here is a tar of the patches that apply to the initrd_progs "init" script.
Extract with tar to produce 5 ".diff" files in the same directory.
Patch "init" with the ".diff" files in order, they should apply cleanly.

gyro
initrd_progs-patches.tar.gz
Description  tar xf initrd_progs-patches.tar.gz to produce 5 ".diff" files.
gz

 Download 
Filename  initrd_progs-patches.tar.gz 
Filesize  6.32 KB 
Downloaded  198 Time(s) 
Back to top
View user's profile Send private message 
jlst

Joined: 23 Nov 2012
Posts: 571

PostPosted: Tue 31 May 2016, 10:30    Post subject:  

I was just going to test your patched init, but now you're giving me options, I choose 3.

01micko said that the work in initrd_progs will land in the main repo in the next woof iteration, whatever that means.

So you're free to do whatever you like in intird_progs, of course I might add some commits too, open a pull request there and I will merge it asap and will take the time to test for an hour or two..

If you're using the build script, now you have about 360 apps to toy with including a busybox version of guess_fstype...
Back to top
View user's profile Send private message 
jlst

Joined: 23 Nov 2012
Posts: 571

PostPosted: Tue 31 May 2016, 12:16    Post subject:  

OK gyro, I applied the patches and tested a couple of times... looks ok. So I opened a pull request (I added 5 commits crediting as the author), here it is, confirm it's ok and then i'l

https://github.com/puppylinux-woof-CE/initrd_progs/pull/8

This very init file can be placed in the main repo with 1 commit, you may open a pull request or i'll push it directly crediting you as the author (whatever you think is right), but you might want to test it with a tharpup and slacko initrd.gz first ...
Back to top
View user's profile Send private message 
gyro

Joined: 28 Oct 2008
Posts: 1799
Location: Brisbane, Australia

PostPosted: Wed 01 Jun 2016, 01:25    Post subject:  

@jlst,

Looks good.
Inspecting the changes looks OK.
Downloaded file is identical to my "init.initrd_progs3".
Testing in Tahrpup 6.0.5 "initrd.gz", worked fine.
Booted from ata and usb, no problems.
Booted "pfix=nocopy", no problems.

I haven't been able to test on a machine with limited memory so some sfs get copied to ram and some don't. (Don't have one.)

My only query is, did I use the correct file for testing?
I clicked on your URL.
Clicked on "Commits" tab
Against "init: "psave" boot parmam can specify a partition and filename." clicked on "<>" button.
Clicked on "Clode or download" button
Clicked on "Download ZIP"
Extracted zip file
Used "0initrd/init"

I have no problem with you continuing with your pull-request.

Thanks for your help.

gyro
Back to top
View user's profile Send private message 
jlst

Joined: 23 Nov 2012
Posts: 571

PostPosted: Wed 01 Jun 2016, 10:44    Post subject:  

Uhmmm I'm not sure... I merged it before repeating your steps, this is the current init:

https://raw.githubusercontent.com/puppylinux-woof-CE/initrd_progs/master/0initrd/init

if there are no diffs with the init you used then it's ok.

This init doesn't have any particular change that requires some extra adjustments.. the big difference now is in the static progs:
- cp -> busybox cp
- find -> busybox find
- xargs -> busybox xargs (has changed from -l to -n 1)
and some other apps : busybox
Back to top
View user's profile Send private message 
gyro

Joined: 28 Oct 2008
Posts: 1799
Location: Brisbane, Australia

PostPosted: Wed 01 Jun 2016, 12:27    Post subject:  

jlst wrote:
Uhmmm I'm not sure... I merged it before repeating your steps, this is the current init:

https://raw.githubusercontent.com/puppylinux-woof-CE/initrd_progs/master/0initrd/init

if there are no diffs with the init you used then it's ok.
I downloaded the "init" of your URL, and "diff" shows no difference between it and the one I used.

gyro
Back to top
View user's profile Send private message 
jlst

Joined: 23 Nov 2012
Posts: 571

PostPosted: Wed 01 Jun 2016, 13:50    Post subject:  

Ok i did it... the huge_extras/init has been updated with 1 commit. Even in your github account page shows that you did the commit hehe

https://github.com/puppylinux-woof-CE/woof-CE/commit/2d1f77327a2ec184af1974ca69991c138ac16538
Back to top
View user's profile Send private message 
gyro

Joined: 28 Oct 2008
Posts: 1799
Location: Brisbane, Australia

PostPosted: Thu 02 Jun 2016, 05:02    Post subject:  

Then unless some bug is found in the code, this is done.
gyro
Back to top
View user's profile Send private message 
jlst

Joined: 23 Nov 2012
Posts: 571

PostPosted: Thu 02 Jun 2016, 09:22    Post subject:  

peebee has requested that the fdrv behaves just like the other *drv files

right now it requires that fw_drv param, also fdrv= triggers something as far as I can tell

https://github.com/puppylinux-woof-CE/woof-CE/issues/785

What do you think?... perhaps a new patch from you to fix this issue..
Back to top
View user's profile Send private message 
jlst

Joined: 23 Nov 2012
Posts: 571

PostPosted: Thu 02 Jun 2016, 10:13    Post subject:  

Also... gyro... this needs to be documented in the puppy iso... help2.msg?...

Perhaps something like this:

psubdir=puppies/slacko Path in which Puppy is installed.
.
.
pupsfs=<partition>:/puppies/slacko/puppy.sfs Override auto search.
zdrv=<partition>:/puppies/slacko/zpuppy.sfs Override auto search.
fdrv=<partition>:/puppies/slacko/fpuppy.sfs Override auto search.
adrv=<partition>:/puppies/slacko/apuppy.sfs Override auto search.
ydrv=<partition>:/puppies/slacko/ypuppy.sfs Override auto search.
psave=<partition>:savefile.4fs Override auto search.

.
.
.

* <partition> can be a name (sda1), label (Work) or UUID (1ab736oqjGkdf)
* if file does not start with a "/", then PSUBDIR is prepended to it
Back to top
View user's profile Send private message 
gyro

Joined: 28 Oct 2008
Posts: 1799
Location: Brisbane, Australia

PostPosted: Fri 03 Jun 2016, 09:49    Post subject:  

jlst wrote:
peebee has requested that the fdrv behaves just like the other *drv files

right now it requires that fw_drv param, also fdrv= triggers something as far as I can tell

https://github.com/puppylinux-woof-CE/woof-CE/issues/785

What do you think?... perhaps a new patch from you to fix this issue..
I agree with peebee.

I don't understand why the fdrv support was implemented that way.
But a fix is quite straight forward.
Remove all the "[ "$EXTRAFW" = "yes" ]" conditions around the fdrv code, and remove the "fw_drv" pfix parameter.

Yes, I could do it, but I think I should look at the doco issue first.

gyro
Back to top
View user's profile Send private message 
gyro

Joined: 28 Oct 2008
Posts: 1799
Location: Brisbane, Australia

PostPosted: Fri 03 Jun 2016, 11:45    Post subject:  

Well, here's a patch to get rid of EXTRAFW. (untested)
gyro
noEXTRAFW.diff.gz
Description  gunzip to produce ".diff" file.
gz

 Download 
Filename  noEXTRAFW.diff.gz 
Filesize  1.36 KB 
Downloaded  194 Time(s) 
Back to top
View user's profile Send private message 
Display posts from previous:   Sort by:   
Page 3 of 4 [60 Posts]   Goto page: Previous 1, 2, 3, 4 Next
This forum is locked: you cannot post, reply to, or edit topics.   This topic is locked: you cannot edit posts or make replies. View previous topic :: View next topic
 Forum index » Advanced Topics » Cutting edge
Jump to:  

You cannot post new topics in this forum
You cannot reply to topics in this forum
You cannot edit your posts in this forum
You cannot delete your posts in this forum
You cannot vote in polls in this forum
You cannot attach files in this forum
You can download files in this forum


Powered by phpBB © 2001, 2005 phpBB Group
[ Time: 0.0620s ][ Queries: 12 (0.0176s) ][ GZIP on ]