almalinux/lorax
13
0
Fork 0
Code Issues Pull Requests Releases Activity

Fixed filename changes

Browse Source
This commit is contained in:
Martin Gracik 2010-01-15 13:30:23 +01:00
parent 9867c805d0
commit 492037c54b
8 changed files with 49 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
etc/lorax/config.noarch
View File

@ -9,7 +9,7 @@ packages:
smartmontools iscsi-initiator-utils samba-client mtr gtk-nodoka-engine smartmontools iscsi-initiator-utils samba-client mtr gtk-nodoka-engine
ftp openssh-clients gtk+ gdk-pixbuf madan-fonts lklug-fonts ftp openssh-clients gtk+ gdk-pixbuf madan-fonts lklug-fonts
xorg-x11-fonts-ethiopic un-core-fonts-dotum man yum-fedorakmod xorg-x11-fonts-ethiopic un-core-fonts-dotum man yum-fedorakmod
/etc/gtk-2.0/gtkrc /etc/gtk-2.0/gtkrc NetworkManager-gnome wget
modules: modules:
sunrpc lockd floppy cramfs loop edd pcspkr squashfs sunrpc lockd floppy cramfs loop edd pcspkr squashfs

7
etc/lorax/config.ppc Normal file
View File

@ -0,0 +1,7 @@
[lorax]
packages:
pcmciautils pdisk yaboot hfsutils fbset ppc64-utils
initrd_template=templates/initrd/initrd.i386
scrubs_template=templates/scrubs/scrubs.i386

10
etc/lorax/config.ppc64 Normal file
View File

@ -0,0 +1,10 @@
[lorax]
packages:
pcmciautils pdisk yaboot hfsutils fbset ppc64-utils
modules:
spufs viocd gpio_mdio
initrd_template=templates/initrd/initrd.i386
scrubs_template=templates/scrubs/scrubs.i386

38
etc/lorax/templates/initrd/includes/initrd
View File

@ -31,8 +31,7 @@ makedirs ${initrd}/etc/modprobe.d
makedirs ${initrd}/etc/NetworkManager/dispatcher.d makedirs ${initrd}/etc/NetworkManager/dispatcher.d
makedirs ${initrd}/${libdir}/dbus-1 makedirs ${initrd}/${libdir}/dbus-1
makedirs ${initrd}/etc/sysconfig/network-scripts makedirs ${initrd}/etc/sysconfig/network-scripts
makedirs ${initrd}/usr/share/PolicyKit/policy makedirs ${initrd}/usr/share/polkit-1/actions
makedirs ${initrd}/etc/PolicyKit
makedirs ${initrd}/var/lib/misc makedirs ${initrd}/var/lib/misc
makedirs ${initrd}/etc/hal/fdi makedirs ${initrd}/etc/hal/fdi
makedirs ${initrd}/usr/share/hal/fdi makedirs ${initrd}/usr/share/hal/fdi
@ -98,7 +97,6 @@ symlink name ${initrd}/etc/init.d target /etc/rc.d/init.d
## dhcp and dhcpv6 client daemons and support programs ## dhcp and dhcpv6 client daemons and support programs
copy ${instroot} sbin/dhclient to ${initrd} sbin copy ${instroot} sbin/dhclient to ${initrd} sbin
copy ${instroot} sbin/dhclient-script to ${initrd} sbin copy ${instroot} sbin/dhclient-script to ${initrd} sbin
copy ${instroot} sbin/dhcp6c to ${initrd} sbin
copy ${instroot} sbin/arping to ${initrd} sbin copy ${instroot} sbin/arping to ${initrd} sbin
copy ${instroot} sbin/ifconfig to ${initrd} sbin copy ${instroot} sbin/ifconfig to ${initrd} sbin
copy ${instroot} sbin/ip to ${initrd} sbin copy ${instroot} sbin/ip to ${initrd} sbin
@ -123,15 +121,13 @@ copy ${instroot} etc/hal/fdi/* to ${initrd} etc/hal/fdi
copy ${instroot} etc/dbus-1/system.d/hal.conf to ${initrd} etc/dbus-1/system.d copy ${instroot} etc/dbus-1/system.d/hal.conf to ${initrd} etc/dbus-1/system.d
## policykit ## policykit
copy ${instroot} etc/PolicyKit/PolicyKit.conf to ${initrd} etc/PolicyKit copy ${instroot} etc/polkit-1 to ${initrd} etc
copy ${instroot} \ copy ${instroot} \
usr/share/dbus-1/system-services/org.freedesktop.PolicyKit.service to \ usr/share/dbus-1/system-services/org.freedesktop.PolicyKit1.service to \
${initrd} usr/share/dbus-1/system-services ${initrd} usr/share/dbus-1/system-services
copy ${instroot} usr/share/PolicyKit/policy/org.freedesktop.policykit.policy \ copy ${instroot} usr/share/polkit-1/actions/org.freedesktop.policykit.policy \
to ${initrd} usr/share/PolicyKit/policy to ${initrd} usr/share/polkit-1/actions
copy ${instroot} var/lib/misc/PolicyKit.reload to ${initrd} var/lib/misc
## dbus ## dbus
copy ${instroot} bin/dbus-uuidgen to ${initrd} sbin copy ${instroot} bin/dbus-uuidgen to ${initrd} sbin
@ -158,17 +154,16 @@ copy ${instroot} \
## networkmanager ## networkmanager
copy ${instroot} usr/sbin/NetworkManager to ${initrd} usr/sbin copy ${instroot} usr/sbin/NetworkManager to ${initrd} usr/sbin
copy ${instroot} usr/sbin/nm-system-settings to ${initrd} usr/sbin
copy ${instroot} etc/dbus-1/system.d/nm-*.conf to ${initrd} etc/dbus-1/system.d copy ${instroot} etc/dbus-1/system.d/nm-*.conf to ${initrd} etc/dbus-1/system.d
copy ${instroot} etc/dbus-1/system.d/NetworkManager.conf to \ copy ${instroot} etc/dbus-1/system.d/NetworkManager.conf to \
${initrd} etc/dbus-1/system.d ${initrd} etc/dbus-1/system.d
copy ${instroot} etc/NetworkManager/nm-system-settings.conf to \ copy ${instroot} etc/NetworkManager/nm-system-settings.conf to \
${initrd} etc/NetworkManager ${initrd} etc/NetworkManager
copy ${instroot} \ copy ${instroot} \
usr/${libdir}/NetworkManager/libnm-settings-plugin-ifcfg-fedora.so to \ usr/${libdir}/NetworkManager/libnm-settings-plugin-ifcfg-rh.so to \
${initrd} usr/${libdir}/NetworkManager ${initrd} usr/${libdir}/NetworkManager
copy ${instroot} usr/libexec/nm-* to ${initrd} usr/libexec copy ${instroot} usr/libexec/nm-* to ${initrd} usr/libexec
copy ${instroot} usr/share/dbus-1/system-services/org.freedesktop.NetworkManagerSystemSettings.service to ${initrd} usr/share/dbus-1/system-services ##copy ${instroot} usr/share/dbus-1/system-services/org.freedesktop.NetworkManagerSystemSettings.service to ${initrd} usr/share/dbus-1/system-services
copy ${instroot} usr/share/dbus-1/system-services/org.freedesktop.nm_dispatcher.service to ${initrd} usr/share/dbus-1/system-services copy ${instroot} usr/share/dbus-1/system-services/org.freedesktop.nm_dispatcher.service to ${initrd} usr/share/dbus-1/system-services
## modprobe ## modprobe
@ -210,7 +205,7 @@ copy ${instroot} bin/fgrep to ${initrd} sbin
copy ${instroot} bin/grep to ${initrd} sbin copy ${instroot} bin/grep to ${initrd} sbin
copy ${instroot} bin/kill to ${initrd} sbin copy ${instroot} bin/kill to ${initrd} sbin
copy ${instroot} bin/ln to ${initrd} sbin copy ${instroot} bin/ln to ${initrd} sbin
copy ${instroot} bin/readlink to ${initrd} sbin copy ${instroot} usr/bin/readlink to ${initrd} sbin
copy ${instroot} bin/rm to ${initrd} sbin copy ${instroot} bin/rm to ${initrd} sbin
copy ${instroot} bin/rmdir to ${initrd} sbin copy ${instroot} bin/rmdir to ${initrd} sbin
copy ${instroot} bin/sed to ${initrd} sbin copy ${instroot} bin/sed to ${initrd} sbin
@ -228,15 +223,24 @@ copy ${instroot} usr/lib/anaconda-runtime/loader/loader.tr to ${initrd} etc
chmod ${initrd}/etc/loader.tr mode 0644 chmod ${initrd}/etc/loader.tr mode 0644
## indirect dependencies ## indirect dependencies
##copy ${instroot} ${libdir}/ld-linux.so.2 to ${initrd} ${libdir} copy ${instroot} ${libdir}/ld-linux.so.2 to ${initrd} ${libdir}
copy ${instroot} ${libdir}/libcom_err.so.2 to ${initrd} ${libdir} copy ${instroot} ${libdir}/libcom_err.so.2 to ${initrd} ${libdir}
copy ${instroot} ${libdir}/libdbus-glib-1.so.2 to ${initrd} ${libdir} ##copy ${instroot} ${libdir}/libdbus-glib-1.so.2 to ${initrd} ${libdir}
copy ${instroot} ${libdir}/libfreebl3.so to ${initrd} ${libdir} ##copy ${instroot} ${libdir}/libfreebl3.so to ${initrd} ${libdir}
copy ${instroot} ${libdir}/libgcc_s.so.1 to ${initrd} ${libdir} copy ${instroot} ${libdir}/libgcc_s.so.1 to ${initrd} ${libdir}
copy ${instroot} ${libdir}/libnss_dns.so.2 to ${initrd} ${libdir} copy ${instroot} ${libdir}/libnss_dns.so.2 to ${initrd} ${libdir}
copy ${instroot} ${libdir}/libnss_files.so.2 to ${initrd} ${libdir} copy ${instroot} ${libdir}/libnss_files.so.2 to ${initrd} ${libdir}
copy ${instroot} ${libdir}/libsoftokn3.so to ${initrd} ${libdir} ##copy ${instroot} ${libdir}/libsoftokn3.so to ${initrd} ${libdir}
copy ${instroot} usr/${libdir}/libsqlite3.so.0 to ${initrd} usr/${libdir} copy ${instroot} usr/${libdir}/libsqlite3.so.0 to ${initrd} usr/${libdir}
## langtable ## langtable
copy ${instroot} usr/lib/anaconda/lang-table to ${initrd} etc copy ${instroot} usr/lib/anaconda/lang-table to ${initrd} etc
## missing files
copy ${instroot} usr/sbin/dmidecode to ${initrd} bin
copy ${instroot} sbin/load_policy to ${initrd} bin
copy ${instroot} sbin/mdadm to ${initrd} bin
copy ${instroot} sbin/mdmon to ${initrd} bin
copy ${instroot} bin/mkdir to ${initrd} bin
copy ${instroot} usr/bin/wget to ${initrd} bin

2
etc/lorax/templates/initrd/initrd.i386
View File

@ -7,5 +7,5 @@ symlink name ${initrd}/sbin/halt target init
symlink name ${initrd}/sbin/poweroff target init symlink name ${initrd}/sbin/poweroff target init
## screenfont ## screenfont
copy ${instroot} usr/lib/anaconda-runtime/screenfont-${arch}.gz to \ copy ${instroot} usr/lib/anaconda-runtime/screenfont-${basearch}.gz to \
${initrd} etc/screenfont.gz ${initrd} etc/screenfont.gz

8
etc/lorax/templates/scrubs/scrubs.i386
View File

@ -20,8 +20,8 @@ remove ${instroot}/usr/local
remove ${instroot}/usr/tmp remove ${instroot}/usr/tmp
## remove modules and firmware directories ## remove modules and firmware directories
remove ${instroot}/lib/modules ##remove ${instroot}/lib/modules
remove ${instroot}/lib/firmware ##remove ${instroot}/lib/firmware
## remove directories from /var ## remove directories from /var
remove ${instroot}/var/db remove ${instroot}/var/db
@ -50,7 +50,7 @@ remove ${instroot}/lib/xtables
remove ${instroot}/etc/ConsoleKit remove ${instroot}/etc/ConsoleKit
remove ${instroot}/etc/X11 remove ${instroot}/etc/X11
remove ${instroot}/etc/alternatives remove ${instroot}/etc/alternatives
remove ${instroot}/etc/asterisk ##remove ${instroot}/etc/asterisk
remove ${instroot}/etc/avahi remove ${instroot}/etc/avahi
remove ${instroot}/etc/blkid remove ${instroot}/etc/blkid
remove ${instroot}/etc/bonobo* remove ${instroot}/etc/bonobo*
@ -68,7 +68,7 @@ remove ${instroot}/etc/gcrypt
remove ${instroot}/etc/gnome-vfs* remove ${instroot}/etc/gnome-vfs*
remove ${instroot}/etc/gnupg remove ${instroot}/etc/gnupg
remove ${instroot}/etc/gtk remove ${instroot}/etc/gtk
remove ${instroot}/etc/hotplug ##remove ${instroot}/etc/hotplug
remove ${instroot}/etc/init.d remove ${instroot}/etc/init.d
remove ${instroot}/etc/iproute2 remove ${instroot}/etc/iproute2
remove ${instroot}/etc/iscsi remove ${instroot}/etc/iscsi

4
src/pylorax/ramdisk.py
View File

@ -81,6 +81,7 @@ class Ramdisk(object):
def process_actions(self): def process_actions(self):
for action in self.actions: for action in self.actions:
self.output.debug(str(action))
action.execute() action.execute()
def create_modinfo(self, moddir, target): def create_modinfo(self, moddir, target):
@ -232,7 +233,8 @@ class Ramdisk(object):
utils.scopy(src_root=self.conf.installtree, utils.scopy(src_root=self.conf.installtree,
src_path=path, src_path=path,
dst_root=self.conf.ramdisktree, dst_root=self.conf.ramdisktree,
dst_path=path) dst_path=path,
ignore_errors=True)
# copy additional firmware # copy additional firmware
fw = [ ("ipw2100", "ipw2100*"), fw = [ ("ipw2100", "ipw2100*"),

3
src/pylorax/utils.py
View File

@ -40,7 +40,8 @@ def expand_path(path, globs=True):
l.extend(expand_path(m.group("prefix") + f + m.group("suffix"), l.extend(expand_path(m.group("prefix") + f + m.group("suffix"),
globs=globs)) globs=globs))
else: else:
if globs: # XXX are there any other chars in globs?
if globs and (path.find("*") != -1 or path.find("?") != -1):
l.extend(glob.glob(path)) l.extend(glob.glob(path))
else: else:
l.append(path) l.append(path)