[arch-releng] [PATCH 07/13] version update in Makefile

newer
Re: [arch-releng] [PATCH 07/13]...

older
[arch-releng] isohybrid -offset...

Gerardo Exequiel Pozzi

16 Mar 2010 16 Mar '10

6:29 a.m.

Signed-off-by: Gerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar> --- configs/syslinux-iso/Makefile | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/configs/syslinux-iso/Makefile b/configs/syslinux-iso/Makefile index 8118a8d..9368d1e 100644 --- a/configs/syslinux-iso/Makefile +++ b/configs/syslinux-iso/Makefile @@ -1,4 +1,4 @@ -ver=2010.02 +ver=2010.03 kver=2.6.32-ARCH WORKDIR=work -- 1.7.0.2

Show replies by date

Gerardo Exequiel Pozzi

16 Mar 16 Mar

6:29 a.m.

New subject: [arch-releng] [PATCH 08/13] Add -p to blkid in hooks, to bypass the cache like in udev rules.

Signed-off-by: Gerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar> --- archiso/hooks/archiso | 2 +- archiso/hooks/archiso_early | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/archiso/hooks/archiso b/archiso/hooks/archiso index 73f4df9..c1821d4 100644 --- a/archiso/hooks/archiso +++ b/archiso/hooks/archiso @@ -89,7 +89,7 @@ archiso_mount_handler() { launch_interactive_shell done - FSTYPE=$(blkid -o value -s TYPE ${archisodevice} 2> /dev/null) + FSTYPE=$(blkid -o value -s TYPE -p ${archisodevice} 2> /dev/null) if [ -n "${FSTYPE}" ]; then if mount -r -t "${FSTYPE}" ${archisodevice} /bootmnt > /dev/null 2>&1; then if [ -e "${isomounts}" ]; then diff --git a/archiso/hooks/archiso_early b/archiso/hooks/archiso_early index edd554b..465e105 100644 --- a/archiso/hooks/archiso_early +++ b/archiso/hooks/archiso_early @@ -2,7 +2,7 @@ run_hook () { if [ -n "${archisolabel}" ]; then - echo "ACTION==\"add|change\", SUBSYSTEM==\"block\", IMPORT{program}=\"/sbin/blkid -o udev \$tempnode\"" > /lib/udev/rules.d/00-archiso-device.rules + echo "ACTION==\"add|change\", SUBSYSTEM==\"block\", IMPORT{program}=\"/sbin/blkid -o udev -p \$tempnode\"" > /lib/udev/rules.d/00-archiso-device.rules echo "ENV{ID_FS_LABEL_ENC}==\"${archisolabel}\", SYMLINK+=\"archiso\"" >> /lib/udev/rules.d/00-archiso-device.rules fi } -- 1.7.0.2

Gerardo Exequiel Pozzi

6:29 a.m.

New subject: [arch-releng] [PATCH 09/13] Add missing archiso_early on uninstall procedure at Makefile

Signed-off-by: Gerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar> --- archiso/Makefile | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/archiso/Makefile b/archiso/Makefile index 2f30175..eab4f66 100644 --- a/archiso/Makefile +++ b/archiso/Makefile @@ -19,6 +19,8 @@ uninstall: rm -f $(DESTDIR)/usr/sbin/mkarchiso rm -f $(DESTDIR)/usr/bin/testiso rm -f $(DESTDIR)/lib/initcpio/hooks/archiso + rm -f $(DESTDIR)/lib/initcpio/hooks/archiso_early rm -f $(DESTDIR)/lib/initcpio/install/archiso + rm -f $(DESTDIR)/lib/initcpio/install/archiso_early rm -rf $(DESTDIR)/usr/share/archiso/ rm -rf $(DESTDIR)/usr/share/doc/archiso/ -- 1.7.0.2

Gerardo Exequiel Pozzi

6:29 a.m.

New subject: [arch-releng] [PATCH 10/13] Add do_fix_perms() in archiso rc script.

Fix file permissions, since GIT does not manage perms other than 755 and 644. Also this can be used to adjusts owner:group. Signed-off-by: Gerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar> --- configs/syslinux-iso/overlay/etc/rc.d/archiso | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/configs/syslinux-iso/overlay/etc/rc.d/archiso b/configs/syslinux-iso/overlay/etc/rc.d/archiso index 618a79e..c30b435 100755 --- a/configs/syslinux-iso/overlay/etc/rc.d/archiso +++ b/configs/syslinux-iso/overlay/etc/rc.d/archiso @@ -81,10 +81,19 @@ do_locale_gen () stat_done } +# GIT does not manage perms others thans 755 and 644, so fix here. +do_fix_perms () +{ + stat_busy "Fixing file permissions..." + chmod 440 /etc/sudoers + stat_done +} + case "$1" in start) do_locale_gen do_makeuser + do_fix_perms ;; esac exit 0 -- 1.7.0.2

Gerardo Exequiel Pozzi

6:29 a.m.

New subject: [arch-releng] [PATCH 11/13] Add -m option to useradd in archiso rc script.

This make the user home automatically with correct perms, and also copies skel. Signed-off-by: Gerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar> --- configs/syslinux-iso/overlay/etc/rc.d/archiso | 5 +---- 1 files changed, 1 insertions(+), 4 deletions(-) diff --git a/configs/syslinux-iso/overlay/etc/rc.d/archiso b/configs/syslinux-iso/overlay/etc/rc.d/archiso index c30b435..435152a 100755 --- a/configs/syslinux-iso/overlay/etc/rc.d/archiso +++ b/configs/syslinux-iso/overlay/etc/rc.d/archiso @@ -66,10 +66,7 @@ do_makeuser () { stat_busy "Making the default user arch" addgroups="audio,disk,optical,wheel" - useradd -p "" -g users -G $addgroups arch - mkdir /home/arch - chmod 700 /home/arch - chown arch:users /home/arch + useradd -m -p "" -g users -G $addgroups arch stat_done } -- 1.7.0.2

Gerardo Exequiel Pozzi

6:29 a.m.

New subject: [arch-releng] [PATCH 12/13] Fixed msg about copying images to RAM

Signed-off-by: Gerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar> --- archiso/hooks/archiso | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/archiso/hooks/archiso b/archiso/hooks/archiso index c1821d4..592003b 100644 --- a/archiso/hooks/archiso +++ b/archiso/hooks/archiso @@ -25,7 +25,7 @@ _mnt_squashfs() { tmp_mnt="/tmpfs/mnt/${img_name}" if [ "${copytoram}" = "y" ]; then - msg -n ":: Copying squashfs image to RAM" + msg -n ":: Copying squashfs image to RAM..." /bin/cp "${img}" "/tmpfs.sqfs/${img_fullname}" img="/tmpfs.sqfs/${img_fullname}" msg "done." -- 1.7.0.2

Gerardo Exequiel Pozzi

6:29 a.m.

New subject: [arch-releng] [PATCH 13/13] Revert back isohybrid offset to default setting.

This revert back the commit 991a5c69. This causes more problems than solving (fixing the warning issue in parted) With the default offset 0: * makes posibble to create others extra partitions on USB key and use them inside the live enviroment. * makes posible to use /dev/disk/by-label/ symlinks. archiso_early hook, can be removed. Note: archboot also uses the default offset 0. More info at: http://mailman.archlinux.org/pipermail/arch-releng/2010-March/000912.html http://mailman.archlinux.org/pipermail/arch-releng/2010-March/000890.html Signed-off-by: Gerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar> --- archiso/mkarchiso | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/archiso/mkarchiso b/archiso/mkarchiso index a7afea0..b40eedd 100755 --- a/archiso/mkarchiso +++ b/archiso/mkarchiso @@ -240,14 +240,14 @@ command_iso () { mkisofs ${qflag} -r -l \ -b boot/isolinux/isolinux.bin -c boot/isolinux/boot.cat \ -uid 0 -gid 0 \ - -udf -allow-limited-size -iso-level 3 \ + -udf -allow-limited-size -iso-level 3 \ -input-charset utf-8 -p "prepared by mkarchiso" \ -no-emul-boot -boot-load-size 4 -boot-info-table \ -publisher "${PUBLISHER}" \ -A "${APPLICATION}" \ -V "${LABEL}" \ -o "${imgname}" "${work_dir}/iso/" - isohybrid -offset 1 "${imgname}" + isohybrid "${imgname}" } # Go through the main commands in order. If 'all' was specified, then we want -- 1.7.0.2

Dieter Plaetinck

9:11 a.m.

On Tue, 16 Mar 2010 03:29:17 -0300 Gerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar> wrote:

...

Signed-off-by: Gerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar> --- configs/syslinux-iso/Makefile | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/configs/syslinux-iso/Makefile b/configs/syslinux-iso/Makefile index 8118a8d..9368d1e 100644 --- a/configs/syslinux-iso/Makefile +++ b/configs/syslinux-iso/Makefile @@ -1,4 +1,4 @@ -ver=2010.02 +ver=2010.03 kver=2.6.32-ARCH

WORKDIR=work

wouldn't it be better to set ver=$((date +'%Y-%m-%d')) or however you should write that in Makefile syntax. now that the plan is to build automatically and frequently... Dieter

5394

Age (days ago)

5394

Last active (days ago)

List overview

Download

7 comments

2 participants

participants (2)

Dieter Plaetinck
Gerardo Exequiel Pozzi