Added some packages and config files

Also fixed the modules symlink
This commit is contained in:
Martin Gracik 2010-04-02 14:18:53 +02:00
parent 36104bc143
commit 1ab4a60bc7
5 changed files with 34 additions and 4 deletions

View File

@ -2,10 +2,15 @@
packages: packages:
anaconda kernel *firmware* man hal wget samba-client gfs2-utils nfs-utils anaconda kernel *firmware* man hal wget samba-client gfs2-utils nfs-utils
ntfs-3g rsyslog ethtool openssh openssh-server strace ntfs-3g rsyslog ethtool openssh openssh-server strace udev
xorg-x11-server-Xorg xorg-x11-drivers xorg-x11-server-Xorg xorg-x11-server-utils xorg-x11-drivers
xorg-x11-xauth xorg-x11-font-utils xorg-x11-fonts-misc
dejavu-sans-fonts dejavu-sans-mono-fonts fontconfig freetype
fonts-ISO8859-2
gtk2 gtk2-engines gnome-themes metacity
device-mapper device-mapper-libs device-mapper device-mapper-libs
device-mapper-multipath device-mapper-multipath-libs device-mapper-multipath device-mapper-multipath-libs
selinux-policy-targeted
modules: modules:
sunrpc lockd floppy cramfs loop edd pcspkr squashfs sunrpc lockd floppy cramfs loop edd pcspkr squashfs

View File

@ -2,6 +2,7 @@
from distutils.core import setup from distutils.core import setup
from glob import glob from glob import glob
import os
data_files = [("/etc/lorax", glob("etc/config.*")), data_files = [("/etc/lorax", glob("etc/config.*")),
@ -9,6 +10,10 @@ data_files = [("/etc/lorax", glob("etc/config.*")),
("/etc/lorax/templates", glob("etc/templates/*")) ("/etc/lorax/templates", glob("etc/templates/*"))
] ]
for root, dnames, fnames in os.walk("share"):
for fname in fnames:
data_files.append((root.replace("share", "/usr/share/lorax", 1),
[os.path.join(root, fname)]))
setup(name="lorax", setup(name="lorax",
version="0.1", version="0.1",

10
share/etc/libuser.conf Normal file
View File

@ -0,0 +1,10 @@
[defaults]
skeleton = /mnt/sysimage/etc/skel
mailspooldir = /mnt/sysimage/var/mail
crypt_style = md5
modules = files shadow
create_modules = files shadow
[files]
directory = /mnt/sysimage/etc
[shadow]
directory = /mnt/sysimage/etc

2
share/etc/selinux/config Normal file
View File

@ -0,0 +1,2 @@
SELINUX=permissive
SELINUXTYPE=targeted

View File

@ -130,7 +130,7 @@ export PS1 PATH
libmoddir = os.path.dirname(libmod) libmoddir = os.path.dirname(libmod)
if not os.path.isdir(libmoddir): if not os.path.isdir(libmoddir):
os.makedirs(libmoddir) os.makedirs(libmoddir)
os.symlink("/modules", libmod) os.symlink("../modules", libmod)
# copy all modules to the initrd tree # copy all modules to the initrd tree
os.makedirs(os.path.dirname(dst_moddir)) os.makedirs(os.path.dirname(dst_moddir))
@ -217,7 +217,7 @@ export PS1 PATH
libfwdir = os.path.dirname(libfw) libfwdir = os.path.dirname(libfw)
if not os.path.isdir(libfwdir): if not os.path.isdir(libfwdir):
os.makedirs(libfwdir) os.makedirs(libfwdir)
os.symlink("/firmware", libfw) os.symlink("../firmware", libfw)
# copy additional firmware # copy additional firmware
fw = [("ipw2100", "ipw2100*"), fw = [("ipw2100", "ipw2100*"),
@ -649,6 +649,10 @@ class Install(BaseImageClass):
"libdir": self.conf.libdir} "libdir": self.conf.libdir}
self.parse_template(self.template_file, variables) self.parse_template(self.template_file, variables)
# copy custom files
self.pinfo("copying custom files")
self.copy_custom_files()
installimg = os.path.join(self.workdir, "install.img") installimg = os.path.join(self.workdir, "install.img")
if os.path.isfile(installimg): if os.path.isfile(installimg):
os.unlink(installimg) os.unlink(installimg)
@ -828,6 +832,10 @@ class Install(BaseImageClass):
os.unlink(link) os.unlink(link)
os.symlink(newtarget, link) os.symlink(newtarget, link)
def copy_custom_files(self):
scopy_(src_root=self.conf.datadir, src_path="*",
dst_root=self.dsttree, dst_path="")
class Boot(BaseImageClass): class Boot(BaseImageClass):