webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-24 18:03:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/thirteen' into thirteen

Browse Source
This commit is contained in:
Michael Tremer
2012-10-09 11:17:53 +02:00
parent 9574fde3f7 79117dc15f
commit 77a03efc2f
34 changed files with 355 additions and 133 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/install+setup/libsmooth/netstuff.c
View File

@@ -221,7 +221,14 @@ int changeaddress(struct keyvalue *kv, char *colour, int typeflag,
setnetaddress(kv, colour);
result = 1;
}
}
}
/* Workaround for a bug that dhcp radiobutton also end the dialog at arm
*/
else {
if (es.u.co != cancel) {
error = 1;
}
}
}
while (error);
@@ -322,7 +329,7 @@ void networkdialogcallbacktype(newtComponent cm, void *data)
newtEntrySetFlags(dhcpforcemtuentry, NEWT_FLAG_DISABLED, NEWT_FLAGS_SET);
}
newtRefresh();
newtDrawForm(networkform);
newtDrawForm(networkform);
}
int interfacecheck(struct keyvalue *kv, char *colour)

2
src/scripts/scanhd
View File

@@ -11,7 +11,7 @@ case "$1" in
done
;;
partitions)
cat /proc/partitions | awk '{print $4 " " $3 }' | grep -v name | grep -v "^[:space:]*$" | \
cat /proc/partitions | awk '{print $4 " " $3 }' | grep -v name | grep -v "^[[:space:]]*$" | \
while read device size; do
[ -z "${device}" ] && continue
echo "${device};${size};$(blkid -c /dev/null -s UUID -o value /dev/${device});"