3
0
Fork 0
forked from mirrors/nixpkgs

add some stuff, incl. some things to /etc/inittab, but keep them outcommented

svn path=/nixu/trunk/; revision=3976
This commit is contained in:
Armijn Hemel 2005-09-30 15:22:08 +00:00
parent 9f0a098056
commit f8cea32cf1
3 changed files with 9 additions and 7 deletions

View file

@ -279,7 +279,7 @@ echo "id:2:initdefault:" >> $root/etc/inittab
echo "si::bootwait:$bootPath/bin/boot.sh" >> $root/etc/inittab
echo "ht:06:wait:$bootPath/bin/halt.sh" >> $root/etc/inittab
echo "1:2345:respawn:$bootPath/bin/login.sh /dev/tty1" >> $root/etc/inittab
#echo "2:2345:respawn:$mingetty/sbin/mingetty tty2" >> $root/etc/inittab
echo #"2:2345:respawn:$mingetty/sbin/mingetty tty2" >> $root/etc/inittab
#echo "2:2345:respawn:$bootPath/bin/login.sh /dev/ttys/1" >> $root/etc/inittab
echo setting up networking information...

View file

@ -88,6 +88,7 @@ gnugrep=$($NIX_CMD_PATH/nix-store -r $(echo '(import ./pkgs.nix).gnugrep' | $NIX
which=$($NIX_CMD_PATH/nix-store -r $(echo '(import ./pkgs.nix).which' | $NIX_CMD_PATH/nix-instantiate -))
gnutar=$($NIX_CMD_PATH/nix-store -r $(echo '(import ./pkgs.nix).gnutar' | $NIX_CMD_PATH/nix-instantiate -))
eject=$($NIX_CMD_PATH/nix-store -r $(echo '(import ./pkgs.nix).eject' | $NIX_CMD_PATH/nix-instantiate -))
sysklogd=$($NIX_CMD_PATH/nix-store -r $(echo '(import ./pkgs.nix).sysklogd' | $NIX_CMD_PATH/nix-instantiate -))
#(while read storepath; do
#cp -fa --parents ${storepath} ${archivesDir}
@ -125,8 +126,8 @@ mkdir ${initdir}/var/run
echo copying nixpkgs
svn export ${nixpkgs} ${archivesDir}/pkgs
#cp -fa ${nixpkgs} ${archivesDir}
#svn export ${nixpkgs} ${archivesDir}/pkgs
cp -fa ${nixpkgs} ${archivesDir}
#echo copying packages from store
@ -170,6 +171,7 @@ sed -e "s^@sysvinitPath\@^$sysvinitPath^g" \
-e "s^@gnugrep\@^$gnugrep^g" \
-e "s^@which\@^$which^g" \
-e "s^@eject\@^$eject^g" \
-e "s^@sysklogd\@^$sysklogd^g" \
-e "s^@gnutar\@^$gnutar^g" \
-e "s^@mingetty\@^$mingettyWrapper^g" \
< $fill_disk > $fill_disk.tmp
@ -225,7 +227,7 @@ cp -fau --parents ${coreUtilsDiet} ${initdir}
cp -fau --parents ${e2fsProgs} ${initdir}
cp -fau --parents ${modUtils} ${initdir}
cp -fau --parents ${hotplug} ${initdir}
cp -fau --parents ${eject} ${initdir}
#cp -fau --parents ${eject} ${initdir}
touch ${archivesDir}/NIXOS
@ -248,4 +250,4 @@ mkisofs -rJ -o ${bootiso} -b isolinux/isolinux.bin -c isolinux/boot.cat \
echo cleaning up
chmod -f -R +w ${archivesDir}/*
rm -rf ${archivesDir}/*
#rm -rf ${archivesDir}/*

View file

@ -5,7 +5,7 @@ rec {
nettools nix subversion gcc wget which vim less screen openssh binutils
strace shadowutils iputils gnumake curl gnused gnutar gnugrep gzip
mingettyWrapper grubWrapper syslinux parted module_init_tools hotplug udev
dhcpWrapper man nano eject;
dhcpWrapper man nano eject sysklogd;
boot = (import ./boot) {inherit stdenv kernel bash coreutils findutilsWrapper
utillinux sysvinit e2fsprogs nettools nix subversion gcc wget which vim
@ -17,5 +17,5 @@ rec {
nix shadowutils mingettyWrapper grubWrapper parted module_init_tools hotplug
dhcpWrapper man nano eject;};
everything = [boot sysvinit kernel eject];
everything = [boot sysvinit kernel sysklogd];
}