Changeset 909
- Timestamp:
- 11/01/06 01:28:11 (4 years ago)
- Files:
-
- branches/stable/mondo/src/common/libmondo-devices.c (modified) (1 diff)
- branches/stable/mondo/src/common/libmondo-tools.c (modified) (2 diffs)
- branches/stable/mondo/src/mondorestore/mondo-rstr-tools.c (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
branches/stable/mondo/src/common/libmondo-devices.c
r877 r909 1530 1530 } 1531 1531 paranoid_pclose(fin); 1532 sprintf(tmp, "%s | grep - w \"%s\" > /dev/null 2> /dev/null",1532 sprintf(tmp, "%s | grep -E \"^%s\" > /dev/null 2> /dev/null", 1533 1533 SWAPLIST_COMMAND, device_with_space); 1534 1534 log_msg(4, "tmp (command) = '%s'", tmp); branches/stable/mondo/src/common/libmondo-tools.c
r686 r909 1396 1396 log_msg(4, "Done. Great. Seeting command to something"); 1397 1397 strcpy(command, 1398 "grep -v \":\" /etc/fstab | grep -vx \"#.*\" | grep - w \"/boot\" | tr -s ' ' '\t' | cut -f1 | head -n1");1398 "grep -v \":\" /etc/fstab | grep -vx \"#.*\" | grep -E \"[ ]/boot[ ]\" | tr -s ' ' '\t' | cut -f1 | head -n1"); 1399 1399 log_msg(4, "Cool. Command = '%s'", command); 1400 1400 strcpy(tmp, call_program_and_get_last_line_of_output(command)); … … 1410 1410 } 1411 1411 } else { 1412 sprintf(command, "mount | grep - w \"%s\"", tmp);1412 sprintf(command, "mount | grep -E \"^%s\"", tmp); 1413 1413 log_msg(3, "command = %s", command); 1414 1414 if (run_program_and_log_output(command, 5)) { branches/stable/mondo/src/mondorestore/mondo-rstr-tools.c
r873 r909 1207 1207 /* Find out where it's mounted */ 1208 1208 sprintf(command, 1209 "mount | grep - w %s| tail -n1 | cut -d' ' -f3",1209 "mount | grep -E '^%s' | tail -n1 | cut -d' ' -f3", 1210 1210 g_isodir_device); 1211 1211 log_it("command = %s", command);
