alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

* Use the right mount command in the filesystems job so that

Browse source 
NTFS-3G works properly.

svn path=/nixos/trunk/; revision=12565
This commit is contained in:
Eelco Dolstra 2008-08-09 12:03:08 +00:00
parent 2783f96ce7
commit ffe45949e8
4 changed files with 11 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
system/options.nix
View file

@ -371,7 +371,9 @@ in
extraHosts = mkOption { extraHosts = mkOption {
default = ""; default = "";
example = "192.168.0.1 lanlocalhost"; example = "192.168.0.1 lanlocalhost";
description = "Pasted verbatim into /etc/hosts."; description = ''
Additional entries to be appended to <filename>/etc/hosts</filename>.
'';
}; };
useDHCP = mkOption { useDHCP = mkOption {

2
system/system.nix
View file

@ -108,7 +108,7 @@ rec {
# The services (Upstart) configuration for the system. # The services (Upstart) configuration for the system.
upstartJobs = import ../upstart-jobs/default.nix { upstartJobs = import ../upstart-jobs/default.nix {
inherit config pkgs nix modprobe nssModulesPath nixEnvVars inherit config pkgs nix modprobe nssModulesPath nixEnvVars
optionDeclarations kernelPackages; optionDeclarations kernelPackages mount;
}; };

3
upstart-jobs/default.nix
View file

@ -1,4 +1,4 @@
{config, pkgs, nix, modprobe, nssModulesPath, nixEnvVars, optionDeclarations, kernelPackages}: {config, pkgs, nix, modprobe, nssModulesPath, nixEnvVars, optionDeclarations, kernelPackages, mount}:
let let
@ -118,6 +118,7 @@ let
# Mount file systems. # Mount file systems.
(import ../upstart-jobs/filesystems.nix { (import ../upstart-jobs/filesystems.nix {
inherit mount;
inherit (pkgs) utillinux e2fsprogs; inherit (pkgs) utillinux e2fsprogs;
fileSystems = config.fileSystems; fileSystems = config.fileSystems;
}) })

10
upstart-jobs/filesystems.nix
View file

@ -1,4 +1,4 @@
{utillinux, e2fsprogs, fileSystems}: {utillinux, e2fsprogs, fileSystems, mount}:
let let
@ -61,7 +61,7 @@ script
# remount to change the options but nothing else. # remount to change the options but nothing else.
if cat /proc/mounts | grep -F -q \" $mountPoint \"; then if cat /proc/mounts | grep -F -q \" $mountPoint \"; then
echo \"remounting $device on $mountPoint\" echo \"remounting $device on $mountPoint\"
${utillinux}/bin/mount -t \"$fsType\" \\ ${mount}/bin/mount -t \"$fsType\" \\
-o remount,\"$options\" \\ -o remount,\"$options\" \\
\"$device\" \"$mountPoint\" || true \"$device\" \"$mountPoint\" || true
continue continue
@ -84,7 +84,7 @@ script
if test \"$prevMountPoint\" = \"$mountPoint\"; then if test \"$prevMountPoint\" = \"$mountPoint\"; then
echo \"remounting $device on $mountPoint\" echo \"remounting $device on $mountPoint\"
${utillinux}/bin/mount -t \"$fsType\" \\ ${mount}/bin/mount -t \"$fsType\" \\
-o remount,\"$options\" \\ -o remount,\"$options\" \\
\"$device\" \"$mountPoint\" || true \"$device\" \"$mountPoint\" || true
continue continue
@ -92,7 +92,7 @@ script
if test -n \"$prevMountPoint\"; then if test -n \"$prevMountPoint\"; then
echo \"unmount $device from $prevMountPoint\" echo \"unmount $device from $prevMountPoint\"
${utillinux}/bin/umount \"$prevMountPoint\" || true ${mount}/bin/umount \"$prevMountPoint\" || true
fi fi
fi fi
@ -106,7 +106,7 @@ script
if test \"\$autocreate\" = 1; then mkdir -p \"\$mountPoint\"; fi if test \"\$autocreate\" = 1; then mkdir -p \"\$mountPoint\"; fi
if ${utillinux}/bin/mount -t \"$fsType\" -o \"$options\" \"$device\" \"$mountPoint\"; then if ${mount}/bin/mount -t \"$fsType\" -o \"$options\" \"$device\" \"$mountPoint\"; then
newDevices=1 newDevices=1
fi fi