Re: [Mageia-dev] Something is messed up in theme upgrades.. (initrd.img desymlinkified)

2012-04-04 Thread Pascal Terjan
On Thu, Apr 5, 2012 at 00:13, Thierry Vignaud wrote:

> On 4 April 2012 21:21, Pascal Terjan  wrote:
> >> Yes (it has always been like that). Feel free to fix bootloader.pm to
> >> not do it. Note, however, that you can't simply skip symlinks there as
> >> the initrd.img symlink may also be the only initrd in bootloader config.
> >
> >
> > What about this (untested)?
>
> Well, you didn't run perl_checker, so:
> - you're trying to use the hash as a table, but using a filename as an
> index
> - you don't actually expand any symlink
>
> Still needs to be tested:
>

I wrote it in a few minutes while waiting for the packager meeting to
start, it was just an idea I could have written pseudo code :)
If it seems correct I'll write some working code


Re: [Mageia-dev] Something is messed up in theme upgrades.. (initrd.img desymlinkified)

2012-04-04 Thread Thierry Vignaud
On 4 April 2012 21:21, Pascal Terjan  wrote:
>> Yes (it has always been like that). Feel free to fix bootloader.pm to
>> not do it. Note, however, that you can't simply skip symlinks there as
>> the initrd.img symlink may also be the only initrd in bootloader config.
>
>
> What about this (untested)?

Well, you didn't run perl_checker, so:
- you're trying to use the hash as a table, but using a filename as an index
- you don't actually expand any symlink

Still needs to be tested:


only_once2.patch
Description: Binary data


Re: [Mageia-dev] Something is messed up in theme upgrades.. (initrd.img desymlinkified)

2012-04-04 Thread Pascal Terjan
On Wed, Apr 4, 2012 at 14:40, Anssi Hannula  wrote:
>
> Yes (it has always been like that). Feel free to fix bootloader.pm to
> not do it. Note, however, that you can't simply skip symlinks there as
> the initrd.img symlink may also be the only initrd in bootloader config.


What about this (untested)?


only_once.patch
Description: Binary data


Re: [Mageia-dev] Something is messed up in theme upgrades.. (initrd.img desymlinkified)

2012-04-04 Thread Anssi Hannula
04.04.2012 12:22, Colin Guthrie kirjoitti:
> 'Twas brillig, and Anssi Hannula at 04/04/12 01:36 did gyre and gimble:
>> 04.04.2012 03:09, Anssi Hannula kirjoitti:
>>> 03.04.2012 16:41, Colin Guthrie kirjoitti:
 Hi,

 With a memory of the infamous "initrd killer" problem that is still
 lurking in the background somewhere, something related to theme updates
 is messing things up:

 e.g. see the before and after listings for my /boot


 [colin@jimmy code (master)]$ ll /boot
 total 39784
>>> [...]
 lrwxrwxrwx 1 root root  31 Apr  3 09:22 initrd.img ->
 initrd-3.3.1-desktop-1.mga2.img
>>> [...]
>>>

 After:

 [colin@jimmy code (master)]$ ll /boot
>>> [...]
 -rw-r--r-- 1 root root 7556648 Apr  3 14:33 initrd.img
>>> [...]
>>>
>>> Reproduced:
>>>
>>> root  9723  0.0  0.0  25760  1372 pts/11   S+   03:02   0:00  |
>>>   \_ /bin/sh /usr/share/bootsplash/scripts/switch-themes
>>> Mageia-Default
>>> root  9745  0.2  0.2  93496 20724 pts/11   S+   03:02   0:00  |
>>>   \_ /usr/bin/perl /usr/sbin/bootloader-config --action
>>> update-splash
>>> root 30133  0.0  0.0  25760  1312 pts/11   S+   03:06   0:00  |
>>>   \_ /bin/sh
>>> /usr/share/bootsplash/scripts/make-boot-splash /boot/initrd.img 800
>>> root 30143  0.0  0.0  25760  1340 pts/11   S+   03:06   0:00  |
>>>   \_ /bin/sh
>>> /usr/share/bootsplash/scripts/make-boot-splash-raw /boot/initrd.img
>>> Mageia-Default
>>>
>>> => bork
>>>
>>> So it seems like some recent change in DrakX which causes it to call
>>> make-boot-splash even for /boot/initrd.img...
>>
>> Actually... it would be my recentish change/fix in
>> /usr/share/bootsplash/scripts/make-boot-splash-raw in which $foo.img is
>> now replaced with
>> # gzip > $foo.img.tmp
>> # mv -f $foo.img.tmp $foo.img
>> while it previously was a direct
>> # gzip > $foo.img
>>
>> I've now added a "readlink -f" in the beginning of the script so that it
>> will operate on the symlink target directly, in bootsplash-3.3.8. Thanks
>> for noticing this.
> 
> No worries.
> 
> As a followup question, do you think it'll end up regenerating some
> initrd's several times?
> 
> e.g. I have two symlinks, initrd.img and initrd-desktop.img both
> pointing to the same initrd.
> 
> Will this ultimately get regenerated three times, two of which are
> obviously redundant?

Yes (it has always been like that). Feel free to fix bootloader.pm to
not do it. Note, however, that you can't simply skip symlinks there as
the initrd.img symlink may also be the only initrd in bootloader config.

-- 
Anssi Hannula


Re: [Mageia-dev] Something is messed up in theme upgrades.. (initrd.img desymlinkified)

2012-04-04 Thread Thierry Vignaud
On 4 April 2012 11:22, Colin Guthrie  wrote:
>> Actually... it would be my recentish change/fix in
>> /usr/share/bootsplash/scripts/make-boot-splash-raw in which $foo.img is
>> now replaced with
>> # gzip > $foo.img.tmp
>> # mv -f $foo.img.tmp $foo.img
>> while it previously was a direct
>> # gzip > $foo.img
>>
>> I've now added a "readlink -f" in the beginning of the script so that it
>> will operate on the symlink target directly, in bootsplash-3.3.8. Thanks
>> for noticing this.
>
> No worries.
>
> As a followup question, do you think it'll end up regenerating some
> initrd's several times?
>
> e.g. I have two symlinks, initrd.img and initrd-desktop.img both
> pointing to the same initrd.
>
> Will this ultimately get regenerated three times, two of which are
> obviously redundant?

And obviously slow...


Re: [Mageia-dev] Something is messed up in theme upgrades.. (initrd.img desymlinkified)

2012-04-04 Thread Colin Guthrie
'Twas brillig, and Anssi Hannula at 04/04/12 01:36 did gyre and gimble:
> 04.04.2012 03:09, Anssi Hannula kirjoitti:
>> 03.04.2012 16:41, Colin Guthrie kirjoitti:
>>> Hi,
>>>
>>> With a memory of the infamous "initrd killer" problem that is still
>>> lurking in the background somewhere, something related to theme updates
>>> is messing things up:
>>>
>>> e.g. see the before and after listings for my /boot
>>>
>>>
>>> [colin@jimmy code (master)]$ ll /boot
>>> total 39784
>> [...]
>>> lrwxrwxrwx 1 root root  31 Apr  3 09:22 initrd.img ->
>>> initrd-3.3.1-desktop-1.mga2.img
>> [...]
>>
>>>
>>> After:
>>>
>>> [colin@jimmy code (master)]$ ll /boot
>> [...]
>>> -rw-r--r-- 1 root root 7556648 Apr  3 14:33 initrd.img
>> [...]
>>
>> Reproduced:
>>
>> root  9723  0.0  0.0  25760  1372 pts/11   S+   03:02   0:00  |
>>   \_ /bin/sh /usr/share/bootsplash/scripts/switch-themes
>> Mageia-Default
>> root  9745  0.2  0.2  93496 20724 pts/11   S+   03:02   0:00  |
>>   \_ /usr/bin/perl /usr/sbin/bootloader-config --action
>> update-splash
>> root 30133  0.0  0.0  25760  1312 pts/11   S+   03:06   0:00  |
>>   \_ /bin/sh
>> /usr/share/bootsplash/scripts/make-boot-splash /boot/initrd.img 800
>> root 30143  0.0  0.0  25760  1340 pts/11   S+   03:06   0:00  |
>>   \_ /bin/sh
>> /usr/share/bootsplash/scripts/make-boot-splash-raw /boot/initrd.img
>> Mageia-Default
>>
>> => bork
>>
>> So it seems like some recent change in DrakX which causes it to call
>> make-boot-splash even for /boot/initrd.img...
> 
> Actually... it would be my recentish change/fix in
> /usr/share/bootsplash/scripts/make-boot-splash-raw in which $foo.img is
> now replaced with
> # gzip > $foo.img.tmp
> # mv -f $foo.img.tmp $foo.img
> while it previously was a direct
> # gzip > $foo.img
> 
> I've now added a "readlink -f" in the beginning of the script so that it
> will operate on the symlink target directly, in bootsplash-3.3.8. Thanks
> for noticing this.

No worries.

As a followup question, do you think it'll end up regenerating some
initrd's several times?

e.g. I have two symlinks, initrd.img and initrd-desktop.img both
pointing to the same initrd.

Will this ultimately get regenerated three times, two of which are
obviously redundant?

Col



-- 

Colin Guthrie
colin(at)mageia.org
http://colin.guthr.ie/

Day Job:
  Tribalogic Limited http://www.tribalogic.net/
Open Source:
  Mageia Contributor http://www.mageia.org/
  PulseAudio Hacker http://www.pulseaudio.org/
  Trac Hacker http://trac.edgewall.org/


Re: [Mageia-dev] Something is messed up in theme upgrades.. (initrd.img desymlinkified)

2012-04-03 Thread Anssi Hannula
04.04.2012 03:09, Anssi Hannula kirjoitti:
> 03.04.2012 16:41, Colin Guthrie kirjoitti:
>> Hi,
>>
>> With a memory of the infamous "initrd killer" problem that is still
>> lurking in the background somewhere, something related to theme updates
>> is messing things up:
>>
>> e.g. see the before and after listings for my /boot
>>
>>
>> [colin@jimmy code (master)]$ ll /boot
>> total 39784
> [...]
>> lrwxrwxrwx 1 root root  31 Apr  3 09:22 initrd.img ->
>> initrd-3.3.1-desktop-1.mga2.img
> [...]
> 
>>
>> After:
>>
>> [colin@jimmy code (master)]$ ll /boot
> [...]
>> -rw-r--r-- 1 root root 7556648 Apr  3 14:33 initrd.img
> [...]
> 
> Reproduced:
> 
> root  9723  0.0  0.0  25760  1372 pts/11   S+   03:02   0:00  |
>   \_ /bin/sh /usr/share/bootsplash/scripts/switch-themes
> Mageia-Default
> root  9745  0.2  0.2  93496 20724 pts/11   S+   03:02   0:00  |
>   \_ /usr/bin/perl /usr/sbin/bootloader-config --action
> update-splash
> root 30133  0.0  0.0  25760  1312 pts/11   S+   03:06   0:00  |
>   \_ /bin/sh
> /usr/share/bootsplash/scripts/make-boot-splash /boot/initrd.img 800
> root 30143  0.0  0.0  25760  1340 pts/11   S+   03:06   0:00  |
>   \_ /bin/sh
> /usr/share/bootsplash/scripts/make-boot-splash-raw /boot/initrd.img
> Mageia-Default
> 
> => bork
> 
> So it seems like some recent change in DrakX which causes it to call
> make-boot-splash even for /boot/initrd.img...

Actually... it would be my recentish change/fix in
/usr/share/bootsplash/scripts/make-boot-splash-raw in which $foo.img is
now replaced with
# gzip > $foo.img.tmp
# mv -f $foo.img.tmp $foo.img
while it previously was a direct
# gzip > $foo.img

I've now added a "readlink -f" in the beginning of the script so that it
will operate on the symlink target directly, in bootsplash-3.3.8. Thanks
for noticing this.

-- 
Anssi Hannula


Re: [Mageia-dev] Something is messed up in theme upgrades.. (initrd.img desymlinkified)

2012-04-03 Thread Anssi Hannula
03.04.2012 16:41, Colin Guthrie kirjoitti:
> Hi,
> 
> With a memory of the infamous "initrd killer" problem that is still
> lurking in the background somewhere, something related to theme updates
> is messing things up:
> 
> e.g. see the before and after listings for my /boot
> 
> 
> [colin@jimmy code (master)]$ ll /boot
> total 39784
[...]
> lrwxrwxrwx 1 root root  31 Apr  3 09:22 initrd.img ->
> initrd-3.3.1-desktop-1.mga2.img
[...]

> 
> After:
> 
> [colin@jimmy code (master)]$ ll /boot
[...]
> -rw-r--r-- 1 root root 7556648 Apr  3 14:33 initrd.img
[...]

Reproduced:

root  9723  0.0  0.0  25760  1372 pts/11   S+   03:02   0:00  |
  \_ /bin/sh /usr/share/bootsplash/scripts/switch-themes
Mageia-Default
root  9745  0.2  0.2  93496 20724 pts/11   S+   03:02   0:00  |
  \_ /usr/bin/perl /usr/sbin/bootloader-config --action
update-splash
root 30133  0.0  0.0  25760  1312 pts/11   S+   03:06   0:00  |
  \_ /bin/sh
/usr/share/bootsplash/scripts/make-boot-splash /boot/initrd.img 800
root 30143  0.0  0.0  25760  1340 pts/11   S+   03:06   0:00  |
  \_ /bin/sh
/usr/share/bootsplash/scripts/make-boot-splash-raw /boot/initrd.img
Mageia-Default

=> bork

So it seems like some recent change in DrakX which causes it to call
make-boot-splash even for /boot/initrd.img...

-- 
Anssi Hannula


[Mageia-dev] Something is messed up in theme upgrades.. (initrd.img desymlinkified)

2012-04-03 Thread Colin Guthrie
Hi,

With a memory of the infamous "initrd killer" problem that is still
lurking in the background somewhere, something related to theme updates
is messing things up:

e.g. see the before and after listings for my /boot


[colin@jimmy code (master)]$ ll /boot
total 39784
-rw-r--r-- 1 root root 440 Apr 19  2011 boot.backup.sda
lrwxrwxrwx 1 root root  27 Apr  3 09:43 config ->
config-3.3.1-desktop-1.mga2
-rw-r--r-- 1 root root  129696 Mar 19 15:14 config-3.3.0-desktop-1.mga2
-rw-r--r-- 1 root root  129696 Mar 24 22:50 config-3.3.0-desktop-2.mga2
-rw-r--r-- 1 root root  129667 Apr  3 01:00 config-3.3.1-desktop-1.mga2
drwxr-xr-x 2 root root1024 Mar 21 23:03 dracut/
-rwxr-xr-x 1 root root  537088 Nov 21 15:40 gfxmenu*
drwxr-xr-x 2 root root1024 Apr  3 09:22 grub/
-rw-r--r-- 1 root root 7548398 Mar 24 17:23 initrd-3.3.0-desktop-1.mga2.img
-rw-r--r-- 1 root root 7554637 Mar 25 11:56 initrd-3.3.0-desktop-2.mga2.img
-rw-r--r-- 1 root root 7552233 Apr  3 09:22 initrd-3.3.1-desktop-1.mga2.img
lrwxrwxrwx 1 root root  31 Apr  3 09:22 initrd-desktop.img ->
initrd-3.3.1-desktop-1.mga2.img
lrwxrwxrwx 1 root root  31 Apr  3 09:22 initrd.img ->
initrd-3.3.1-desktop-1.mga2.img
drwx-- 2 root root   12288 May 14  2010 lost+found/
-rw-r--r-- 1 root root  167564 Mar 19 15:14 symvers-3.3.0-desktop-1.mga2.xz
-rw-r--r-- 1 root root  167612 Mar 24 22:50 symvers-3.3.0-desktop-2.mga2.xz
-rw-r--r-- 1 root root  167668 Apr  3 01:00 symvers-3.3.1-desktop-1.mga2.xz
lrwxrwxrwx 1 root root  31 Apr  3 09:28 System.map ->
System.map-3.3.1-desktop-1.mga2
-rw-r--r-- 1 root root 1942497 Sep  4  2011 System.map-3.0.4-1.mga2custom
-rw-r--r-- 1 root root 2165675 Mar 19 15:14 System.map-3.3.0-desktop-1.mga2
-rw-r--r-- 1 root root 2165675 Mar 24 22:50 System.map-3.3.0-desktop-2.mga2
-rw-r--r-- 1 root root 2165824 Apr  3 01:00 System.map-3.3.1-desktop-1.mga2
lrwxrwxrwx 1 root root  28 Apr  3 09:22 vmlinuz ->
vmlinuz-3.3.1-desktop-1.mga2
-rw-r--r-- 1 root root 2731024 Mar 19 15:14 vmlinuz-3.3.0-desktop-1.mga2
-rw-r--r-- 1 root root 2729552 Mar 24 22:50 vmlinuz-3.3.0-desktop-2.mga2
-rw-r--r-- 1 root root 2731232 Apr  3 01:00 vmlinuz-3.3.1-desktop-1.mga2
lrwxrwxrwx 1 root root  28 Apr  3 09:22 vmlinuz-desktop ->
vmlinuz-3.3.1-desktop-1.mga2

After:

[colin@jimmy code (master)]$ ll /boot
total 47469
-rw-r--r-- 1 root root 440 Apr 19  2011 boot.backup.sda
lrwxrwxrwx 1 root root  27 Apr  3 09:43 config ->
config-3.3.1-desktop-1.mga2
-rw-r--r-- 1 root root  129696 Mar 19 15:14 config-3.3.0-desktop-1.mga2
-rw-r--r-- 1 root root  129696 Mar 24 22:50 config-3.3.0-desktop-2.mga2
-rw-r--r-- 1 root root  129667 Apr  3 01:00 config-3.3.1-desktop-1.mga2
drwxr-xr-x 2 root root1024 Mar 21 23:03 dracut/
-rwxr-xr-x 1 root root  537088 Apr  3 14:33 gfxmenu*
drwxr-xr-x 2 root root1024 Apr  3 09:22 grub/
-rw-r--r-- 1 root root 7702983 Apr  3 14:33 initrd-3.3.0-desktop-1.mga2.img
-rw-r--r-- 1 root root 7708571 Apr  3 14:34 initrd-3.3.0-desktop-2.mga2.img
-rw-r--r-- 1 root root 7556641 Apr  3 14:34 initrd-3.3.1-desktop-1.mga2.img
lrwxrwxrwx 1 root root  31 Apr  3 09:22 initrd-desktop.img ->
initrd-3.3.1-desktop-1.mga2.img
-rw-r--r-- 1 root root 7556648 Apr  3 14:33 initrd.img
drwx-- 2 root root   12288 May 14  2010 lost+found/
-rw-r--r-- 1 root root  167564 Mar 19 15:14 symvers-3.3.0-desktop-1.mga2.xz
-rw-r--r-- 1 root root  167612 Mar 24 22:50 symvers-3.3.0-desktop-2.mga2.xz
-rw-r--r-- 1 root root  167668 Apr  3 01:00 symvers-3.3.1-desktop-1.mga2.xz
lrwxrwxrwx 1 root root  31 Apr  3 09:28 System.map ->
System.map-3.3.1-desktop-1.mga2
-rw-r--r-- 1 root root 1942497 Sep  4  2011 System.map-3.0.4-1.mga2custom
-rw-r--r-- 1 root root 2165675 Mar 19 15:14 System.map-3.3.0-desktop-1.mga2
-rw-r--r-- 1 root root 2165675 Mar 24 22:50 System.map-3.3.0-desktop-2.mga2
-rw-r--r-- 1 root root 2165824 Apr  3 01:00 System.map-3.3.1-desktop-1.mga2
lrwxrwxrwx 1 root root  28 Apr  3 09:22 vmlinuz ->
vmlinuz-3.3.1-desktop-1.mga2
-rw-r--r-- 1 root root 2731024 Mar 19 15:14 vmlinuz-3.3.0-desktop-1.mga2
-rw-r--r-- 1 root root 2729552 Mar 24 22:50 vmlinuz-3.3.0-desktop-2.mga2
-rw-r--r-- 1 root root 2731232 Apr  3 01:00 vmlinuz-3.3.1-desktop-1.mga2
lrwxrwxrwx 1 root root  28 Apr  3 09:22 vmlinuz-desktop ->
vmlinuz-3.3.1-desktop-1.mga2



Note that initrd.img is no longer a symlink





Here are the RPMs that were updated. I strongly suspect one of the theme
updates, but we'll need to poke further:


Apr  3 14:33:03 jimmy MageiaUpdate: transaction on / (remove=0,
install=0, upgrade=9)
Apr  3 14:33:05 jimmy MageiaUpdate[15464]: [RPM]
e2fsprogs-1.42.2-1.mga2.x86_64 installed
Apr  3 14:33:05 jimmy MageiaUpdate[15464]: [RPM]
lib64ext2fs2-1.42.2-1.mga2.x86_64 installed
Apr  3 14:33:05 jimmy MageiaUpdate[15464]: [RPM]
lib64gdmgreeter1-3.4.0.1-2.mga2.x86_64 installed
Apr  3 14:33:05 jimmy MageiaUpdate[15464]: [RPM]
lib64gdmsimplegreeter1-3.4.0.1-2.mga2.x86_64 installed
Apr  3 14:33:06 jimmy MageiaUpdate[15464]: [RPM]
gdm-3.4.0.1