re-enable the default debugging login shell
svn path=/nixu/trunk/; revision=6048
This commit is contained in:
Armijn Hemel
parent
183b838ed8
commit
33940db2dc
@ -21,9 +21,6 @@ mount -n -t devpts none /dev/pts
|
||||
echo "remounting / writable..."
|
||||
mount -n -o remount,rw /dev/root /
|
||||
|
||||
echo "starting udev..."
|
||||
@udev@/sbin/udevstart
|
||||
|
||||
echo "setting up hostname..."
|
||||
hostname nixos
|
||||
|
||||
|
||||
@ -9,11 +9,9 @@ for i in $boot $halt $login $env; do
|
||||
dst=$out/bin/$(basename $i | cut -c34-)
|
||||
sed \
|
||||
-e "s^@bash\@^$bash^g" \
|
||||
-e "s^@bashStatic\@^$bashStatic^g" \
|
||||
-e "s^@coreutils\@^$coreutils^g" \
|
||||
-e "s^@findutilsWrapper\@^$findutilsWrapper^g" \
|
||||
-e "s^@utillinux\@^$utillinux^g" \
|
||||
-e "s^@utillinuxStatic\@^$utillinuxStatic^g" \
|
||||
-e "s^@sysvinit\@^$sysvinit^g" \
|
||||
-e "s^@e2fsprogs\@^$e2fsprogs^g" \
|
||||
-e "s^@nettools\@^$nettools^g" \
|
||||
@ -39,7 +37,6 @@ for i in $boot $halt $login $env; do
|
||||
-e "s^@mingettyWrapper\@^$mingettyWrapper^g" \
|
||||
-e "s^@module_init_tools\@^$module_init_tools^g" \
|
||||
-e "s^@grub\@^$grubWrapper^g" \
|
||||
-e "s^@udev\@^$udev^g" \
|
||||
-e "s^@dhcpWrapper\@^$dhcpWrapper^g" \
|
||||
-e "s^@man\@^$man^g" \
|
||||
-e "s^@nano\@^$nano^g" \
|
||||
|
||||
@ -1,8 +1,8 @@
|
||||
{ stdenv, bash, bashStatic, coreutils, findutilsWrapper, utillinux, utillinuxStatic, sysvinit, e2fsprogs
|
||||
{ stdenv, bash, coreutils, findutilsWrapper, utillinux, sysvinit, e2fsprogs
|
||||
, nettools, nix, subversion, gcc, wget, which, vim, less, screen, openssh
|
||||
, binutils, strace, shadowutils, iputils, gnumake, curl, gnused, gnugrep
|
||||
, gnutar, gzip, mingettyWrapper, grubWrapper, parted, module_init_tools
|
||||
, udev, dhcpWrapper, man, nano}:
|
||||
, strace, shadowutils, iputils, gnumake, curl, gnused, gnugrep , gnutar, gzip
|
||||
, mingettyWrapper, grubWrapper, parted, module_init_tools, dhcpWrapper
|
||||
, man, nano}:
|
||||
|
||||
derivation {
|
||||
name = "boot";
|
||||
@ -12,9 +12,9 @@ derivation {
|
||||
halt = ./halt.sh;
|
||||
login = ./login.sh;
|
||||
env = ./env.sh;
|
||||
inherit stdenv bash bashStatic coreutils findutilsWrapper utillinux sysvinit
|
||||
inherit stdenv bash coreutils findutilsWrapper utillinux sysvinit
|
||||
e2fsprogs nettools nix subversion gcc wget which vim less screen
|
||||
openssh binutils strace shadowutils iputils gnumake curl gnused
|
||||
gnutar gnugrep gzip mingettyWrapper grubWrapper parted module_init_tools
|
||||
udev dhcpWrapper man nano;
|
||||
openssh strace shadowutils iputils gnumake curl gnused
|
||||
gnutar gnugrep gzip mingettyWrapper grubWrapper parted
|
||||
module_init_tools dhcpWrapper man nano;
|
||||
}
|
||||
|
||||
@ -10,7 +10,7 @@ export PATH=/bin:/sbin:@bash@/bin:@coreutilsdiet@/bin:@coreutils@/bin:@findutils
|
||||
kernel=@kernel@
|
||||
xawtv=@xawtv@
|
||||
|
||||
storePaths=/mystorepaths
|
||||
narStorePaths=/cdrom/narstorepaths
|
||||
|
||||
sysvinitPath=@sysvinitPath@
|
||||
bootPath=@bootPath@
|
||||
@ -308,6 +308,8 @@ $NIX/nix-env -iKf /nixpkgs/trunk/pkgs/top-level/all-packages.nix gnugrep
|
||||
$NIX/nix-env -iKf /nixpkgs/trunk/pkgs/top-level/all-packages.nix linux
|
||||
$NIX/nix-env -iKf /nixpkgs/trunk/pkgs/top-level/all-packages.nix grub
|
||||
|
||||
cat $narStorePaths | xargs -n 1 -i% $NIX/nix-env -i %
|
||||
|
||||
echo setting init symlink...
|
||||
rm -f $root/init
|
||||
#ln -s $sysvinitPath/sbin/init $root/init
|
||||
|
||||
17
make-disk.sh
17
make-disk.sh
@ -26,6 +26,7 @@ nixpkgs=/nixpkgs/trunk/pkgs
|
||||
fill_disk=$archivesDir/scripts/fill-disk.sh
|
||||
ramdisk_login=$archivesDir/scripts/ramdisk-login.sh
|
||||
storePaths=$archivesDir/mystorepaths
|
||||
narStorePaths=$archivesDir/narstorepaths
|
||||
validatePaths=$archivesDir/validatepaths
|
||||
bootiso=/tmp/nixos.iso
|
||||
initrd=/tmp/initram.img
|
||||
@ -36,7 +37,9 @@ nix=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).nixUnstable' | $NIX/nix-inst
|
||||
|
||||
nixDeps=$($NIX/nix-store -qR $nix)
|
||||
|
||||
storeExpr=$($NIX/nix-store -qR $($NIX/nix-store -r $(echo '(import ./pkgs.nix).everything' | $NIX/nix-instantiate -)))
|
||||
#storeExpr=$($NIX/nix-store -qR $($NIX/nix-store -r $(echo '(import ./pkgs.nix).everything' | $NIX/nix-instantiate -)))
|
||||
#storeExpr1=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).boot' | $NIX/nix-instantiate -))
|
||||
storeExpr=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).boot' | $NIX/nix-instantiate -))
|
||||
#storeExpr=$($NIX/nix-store -r $($NIX/nix-store -qR $(echo '(import ./pkgs.nix).everything' | $NIX/nix-instantiate -)))
|
||||
|
||||
### make NAR files for everything we want to install and some more. Make sure
|
||||
@ -65,9 +68,14 @@ gnugrep=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).gnugrep' | $NIX/nix-inst
|
||||
|
||||
grub=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).grubWrapper' | $NIX/nix-instantiate -))
|
||||
|
||||
combideps=$($NIX/nix-store -qR $nix $utillinux $gnugrep $grub $gzip)
|
||||
findutils=$($NIX/nix-store -q $(echo '(import ./pkgs.nix).findutilsWrapper' | $NIX/nix-instantiate -))
|
||||
|
||||
#for i in $storeExpr
|
||||
combideps=$($NIX/nix-store -qR $nix $utillinux $gnugrep $grub $gzip $findutils)
|
||||
|
||||
for i in $storeExpr
|
||||
do
|
||||
echo $i >> $narStorePaths
|
||||
done
|
||||
#for i in $nixDeps
|
||||
for i in $combideps
|
||||
do
|
||||
@ -101,7 +109,7 @@ BootPath=$($NIX/nix-store -qR $(nix-store -r $(echo '(import ./pkgs.nix).boot' |
|
||||
bashGlibc=$($NIX/nix-store -q $(echo '(import ./pkgs.nix).bash' | $NIX/nix-instantiate -))
|
||||
bash=$($NIX/nix-store -q $(echo '(import ./pkgs.nix).bashStatic' | $NIX/nix-instantiate -))
|
||||
coreutilsdiet=$($NIX/nix-store -q $(echo '(import ./pkgs.nix).coreutilsDiet' | $NIX/nix-instantiate -))
|
||||
findutils=$($NIX/nix-store -q $(echo '(import ./pkgs.nix).findutilsWrapper' | $NIX/nix-instantiate -))
|
||||
#findutils=$($NIX/nix-store -q $(echo '(import ./pkgs.nix).findutilsWrapper' | $NIX/nix-instantiate -))
|
||||
utillinux=$($NIX/nix-store -q $(echo '(import ./pkgs.nix).utillinux' | $NIX/nix-instantiate -))
|
||||
e2fsprogs=$($NIX/nix-store -q $(echo '(import ./pkgs.nix).e2fsprogsDiet' | $NIX/nix-instantiate -))
|
||||
#e2fsprogs=$($NIX/nix-store -q $(echo '(import ./pkgs.nix).e2fsprogs' | $NIX/nix-instantiate -))
|
||||
@ -109,7 +117,6 @@ e2fsprogs=$($NIX/nix-store -q $(echo '(import ./pkgs.nix).e2fsprogsDiet' | $NIX/
|
||||
modutils=$($NIX/nix-store -q $(echo '(import ./pkgs.nix).module_init_toolsStatic' | $NIX/nix-instantiate -))
|
||||
grub=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).grubWrapper' | $NIX/nix-instantiate -))
|
||||
mingettyWrapper=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).mingettyWrapper' | $NIX/nix-instantiate -))
|
||||
udev=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).udev' | $NIX/nix-instantiate -))
|
||||
dhcp=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).dhcpWrapper' | $NIX/nix-instantiate -))
|
||||
nano=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).nano' | $NIX/nix-instantiate -))
|
||||
gnugrep=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).gnugrep' | $NIX/nix-instantiate -))
|
||||
|
||||
24
pkgs.nix
24
pkgs.nix
@ -5,23 +5,23 @@ rec {
|
||||
nixUnstable subversion gcc wget which vim less screen openssh binutils
|
||||
nixStatic strace shadowutils iputils gnumake curl gnused gnutar gnugrep
|
||||
gzip mingettyWrapper grubWrapper syslinux parted module_init_tools
|
||||
module_init_toolsStatic udev dhcpWrapper man nano eject sysklogd mktemp
|
||||
module_init_toolsStatic dhcpWrapper man nano eject sysklogd mktemp
|
||||
cdrtools cpio;
|
||||
|
||||
boot = (import ./boot) {
|
||||
inherit stdenv bash bashStatic coreutils findutilsWrapper utillinux
|
||||
utillinuxStatic sysvinit e2fsprogs nettools subversion gcc wget which
|
||||
vim less screen openssh binutils strace shadowutils iputils gnumake curl
|
||||
gnused gnutar gnugrep gzip mingettyWrapper grubWrapper parted
|
||||
module_init_tools udev dhcpWrapper man nano;
|
||||
inherit stdenv bash coreutils findutilsWrapper utillinux sysvinit
|
||||
e2fsprogs nettools subversion gcc wget which vim less screen openssh
|
||||
strace shadowutils iputils gnumake curl gnused gnutar gnugrep gzip
|
||||
mingettyWrapper grubWrapper parted module_init_tools dhcpWrapper man
|
||||
nano;
|
||||
nix = nixUnstable;
|
||||
};
|
||||
|
||||
init = (import ./init) {inherit stdenv bash bashStatic coreutilsDiet
|
||||
utillinux shadowutils mingettyWrapper grubWrapper parted module_init_tools
|
||||
dhcpWrapper man nano eject e2fsprogsDiet;
|
||||
nix = nixUnstable;
|
||||
};
|
||||
#init = (import ./init) {inherit stdenv bash bashStatic coreutilsDiet
|
||||
# utillinux shadowutils mingettyWrapper grubWrapper parted module_init_tools
|
||||
# dhcpWrapper man nano eject e2fsprogsDiet;
|
||||
# nix = nixUnstable;
|
||||
#};
|
||||
|
||||
everything = [boot sysvinit sysklogd kernel ];
|
||||
everything = [boot sysvinit sysklogd kernel];
|
||||
}
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user