headers
James Buren | 21 May 2013 07:08
Picon

fvbe: ui_newt: remove format parametes here

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=fvbe.git;a=commitdiff;h=8e53b17ba0f3f21e5c93e591d3f1b3049897c2f1

commit 8e53b17ba0f3f21e5c93e591d3f1b3049897c2f1
Author: James Buren <ryuo@...>
Date:   Tue May 21 00:06:32 2013 -0500

ui_newt: remove format parametes here

diff --git a/src/ui_newt.c b/src/ui_newt.c
index c03b65b..05feb02 100644
--- a/src/ui_newt.c
+++ b/src/ui_newt.c
 <at>  <at>  -55,7 +55,7  <at>  <at>  static inline bool findpath(struct format **targets,struct format *target,const
if(t == target)
continue;

-    if(t->newfilesystem == 0 && t->options == 0 && t->mountpath == 0)
+    if(t->newfilesystem == 0 && t->mountpath == 0)
continue;

if(strcmp(t->newfilesystem,"swap") == 0)
 <at>  <at>  -297,10 +297,6  <at>  <at>  static bool ui_dialog_format(struct format **targets,struct format *target)
int entry1_height = 0;
int label1_width = 0;
int label1_height = 0;
-  int entry2_width = 0;
-  int entry2_height = 0;
-  int label2_width = 0;
-  int label2_height = 0;
int listbox_width = 0;
(Continue reading)

Permalink | Reply | 0 comments |
headers
James Buren | 21 May 2013 07:08
Picon

fvbe: text: update to reflect removal of format parameters

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=fvbe.git;a=commitdiff;h=f7826c683db99875e67ee4a5f90244d83417ffb5

commit f7826c683db99875e67ee4a5f90244d83417ffb5
Author: James Buren <ryuo@...>
Date:   Tue May 21 00:01:46 2013 -0500

text: update to reflect removal of format parameters

diff --git a/src/text.h b/src/text.h
index 7a428dc..37df469 100644
--- a/src/text.h
+++ b/src/text.h
 <at>  <at>  -75,11 +75,10  <at>  <at> 
#define FORMAT_TITLE _("Device Setup")
#define FORMAT_TEXT _("Select a device to setup from the list below.\n")
#define FORMAT_DIALOG_TITLE _("Filesystem Setup")
-#define FORMAT_DIALOG_TEXT _("Select mount path, parameters, and filesystem.\nMount path is
optional if 'swap' is the selected filesystem.\nParameters are custom arguments passed to the format
program.\nSelect 'noformat' if you wish to reuse the existing filesystem.\n")
+#define FORMAT_DIALOG_TEXT _("Select a mount path and filesystem.\nMount path is optional if 'swap' is
the selected filesystem.\nSelect 'noformat' if you wish to reuse the existing filesystem.\n")
#define FORMAT_PATH_TITLE _("Invalid Filesystem Parameters")
#define FORMAT_PATH_TEXT _("You have specified invalid parameters.\nPlease check that they meet the
following requirements:\n\nMount path must begin with a '/'.\nMount path may only contain one
directory.\nMount path must not already be in use.\n'noformat' cannot be chosen if there is no existing filesystem.\n")
#define FORMAT_MOUNT_ENTRY_TEXT _("Mount Path")
-#define FORMAT_PARAMETERS_ENTRY_TEXT _("Format Parameters")
#define INSTALL_TITLE _("Package Group Selection")
#define INSTALL_TEXT _("Select which package groups you wish to install.\n")
#define NO_ROOT_TITLE _("No Root Device")
(Continue reading)

Permalink | Reply | 0 comments |
headers
James Buren | 21 May 2013 07:08
Picon

fvbe: format: remove custom parameters

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=fvbe.git;a=commitdiff;h=c12f005f7521a8df0158d3998a8ece9a15956a2d

commit c12f005f7521a8df0158d3998a8ece9a15956a2d
Author: James Buren <ryuo@...>
Date:   Tue May 21 00:01:12 2013 -0500

format: remove custom parameters

diff --git a/src/format.c b/src/format.c
index b00cd33..006dc6d 100644
--- a/src/format.c
+++ b/src/format.c
 <at>  <at>  -29,8 +29,6  <at>  <at>  static inline void free_target(struct format *p)

free(p->newfilesystem);

-  free(p->options);
-
free(p->mountpath);

free(p);
 <at>  <at>  -183,7 +181,7  <at>  <at>  static void format_filter_devices(void)
{
struct format *p = targets[i];

-    if(p->newfilesystem == 0 && p->options == 0 && p->mountpath == 0)
+    if(p->newfilesystem == 0 && p->mountpath == 0)
{
free_target(p);
continue;
(Continue reading)

Permalink | Reply | 0 comments |
headers
James Buren | 21 May 2013 07:08
Picon

fvbe: local: remove definition for format parameters

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=fvbe.git;a=commitdiff;h=cc5b512f2853749e04bddac5717c8fc5924c662a

commit cc5b512f2853749e04bddac5717c8fc5924c662a
Author: James Buren <ryuo@...>
Date:   Tue May 21 00:00:15 2013 -0500

local: remove definition for format parameters

diff --git a/src/local.h b/src/local.h
index 0f94856..4a192a3 100644
--- a/src/local.h
+++ b/src/local.h
 <at>  <at>  -97,7 +97,6  <at>  <at>  struct format
char *filesystem;
bool format;
char *newfilesystem;
-  char *options;
char *mountpath;
};
Permalink | Reply | 0 comments |
headers
James Buren | 21 May 2013 06:45
Picon

fvbe: block: set minimum partition size to 1 MiB if lower than this it prevents the creation of empty partitions

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=fvbe.git;a=commitdiff;h=d41ce1c3e131246330cf1c63c5d0b0f0be8f2d31

commit d41ce1c3e131246330cf1c63c5d0b0f0be8f2d31
Author: James Buren <ryuo@...>
Date:   Mon May 20 23:43:17 2013 -0500

block: set minimum partition size to 1 MiB if lower than this
it prevents the creation of empty partitions

diff --git a/src/block.c b/src/block.c
index 6c79326..4bb14c7 100644
--- a/src/block.c
+++ b/src/block.c
 <at>  <at>  -834,6 +834,9  <at>  <at>  extern int disk_create_partition(struct disk *disk,long long size)
return -1;
}

+  if(size < MEBIBYTE)
+    size = MEBIBYTE;
+
if(!newpartition(disk,size,&part))
return -1;

 <at>  <at>  -904,6 +907,9  <at>  <at>  extern int disk_create_logical_partition(struct disk *disk,long long size)
return -1;
}

+  if(size < MEBIBYTE)
+    size = MEBIBYTE;
+
(Continue reading)

Permalink | Reply | 0 comments |
headers
James Buren | 21 May 2013 05:48
Picon

fvbe: langconfig: revise how systemd setup is used. only locale need be escaped because var is 100% a string literal we control, and thus need not be escaped.

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=fvbe.git;a=commitdiff;h=7099e8cbfacdcf7232241e3b02e812a3d208e1e9

commit 7099e8cbfacdcf7232241e3b02e812a3d208e1e9
Author: James Buren <ryuo@...>
Date:   Mon May 20 22:46:16 2013 -0500

langconfig: revise how systemd setup is used.
only locale need be escaped because var is 100%
a string literal we control, and thus need not be
escaped.

diff --git a/src/langconfig.c b/src/langconfig.c
index 4d4cc6f..8aebc99 100644
--- a/src/langconfig.c
+++ b/src/langconfig.c
 <at>  <at>  -129,11 +129,7  <at>  <at>  static bool update_via_new(void)
return false;
}

-  strfcpy(command,sizeof(command),"localectl set-locale");
-
-  strfcat(command,sizeof(command)," '%s=",shell_escape(var));
-
-  strfcat(command,sizeof(command),"%s'",shell_escape(locale));
+  strfcpy(command,sizeof(command),"localectl set-locale '%s=%s'",var,shell_escape(locale));

for( ; vars[i] != 0 ; ++i )
{
 <at>  <at>  -142,9 +138,7  <at>  <at>  static bool update_via_new(void)
if((locale = getenv(var)) == 0 || strlen(locale) == 0)
(Continue reading)

Permalink | Reply | 0 comments |
headers
James Buren | 21 May 2013 04:53
Picon

ryuotesting11: kernel-3.9-3-x86_64 * bump to patch level 3

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=ryuotesting11.git;a=commitdiff;h=12a514899fa5881e4eb8090b2fb03b830459c35d

commit 12a514899fa5881e4eb8090b2fb03b830459c35d
Author: James Buren <ryuo@...>
Date:   Mon May 20 21:50:54 2013 -0500

kernel-3.9-3-x86_64
* bump to patch level 3

diff --git a/source/base/kernel/FrugalBuild b/source/base/kernel/FrugalBuild
index 8b6783e..92a35a8 100644
--- a/source/base/kernel/FrugalBuild
+++ b/source/base/kernel/FrugalBuild
 <at>  <at>  -1,4 +1,4  <at>  <at> 
-# Compiling Time: 58.87 SBU
+# Compiling Time: 58.88 SBU
# Maintainer: James Buren <ryuo@...>
# Contributor: Miklos Vajna <vmiklos@...>

diff --git a/source/include/kernel-version.sh b/source/include/kernel-version.sh
index 82ecf38..f61b608 100644
--- a/source/include/kernel-version.sh
+++ b/source/include/kernel-version.sh
 <at>  <at>  -17,8 +17,8  <at>  <at> 
# * _F_kernelver_nextver: the next kernel version
###
_F_kernelver_ver=3.9
-_F_kernelver_rel=2
-_F_kernelver_stable=2
+_F_kernelver_rel=3
(Continue reading)

Permalink | Reply | 0 comments |
headers
James Buren | 21 May 2013 04:52
Picon

ryuotesting11: Merge branch 'master' of ../current

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=ryuotesting11.git;a=commitdiff;h=2729e76e245430b54028681c799735c1c79e7508

commit 2729e76e245430b54028681c799735c1c79e7508
Merge: d4d60f8 a69ffa4
Author: James Buren <ryuo@...>
Date:   Mon May 20 21:50:00 2013 -0500

Merge branch 'master' of ../current
Permalink | Reply | 0 comments |
headers
James Buren | 21 May 2013 04:37
Picon

fvbe: format: omit devicepath from progress dialog for swap devices

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=fvbe.git;a=commitdiff;h=e6418c98d294d0509a4f6832f4f259acdb902234

commit e6418c98d294d0509a4f6832f4f259acdb902234
Author: James Buren <ryuo@...>
Date:   Mon May 20 21:35:39 2013 -0500

format: omit devicepath from progress dialog for swap devices

diff --git a/src/format.c b/src/format.c
index ac0e8ff..b00cd33 100644
--- a/src/format.c
+++ b/src/format.c
 <at>  <at>  -245,7 +245,10  <at>  <at>  static bool format_process_devices(void)
{
struct format *target = targets[i];

-    strfcpy(text,sizeof(text),"(%*d/%d) - %-8s - %-8s",padding,i+1,j,target->devicepath,target->newfilesystem);
+    if(strcmp(target->newfilesystem,"swap") == 0)
+      strfcpy(text,sizeof(text),"(%*d/%d) - %-8s",padding,i+1,j,target->newfilesystem);
+    else
+      strfcpy(text,sizeof(text),"(%*d/%d) - %-8s - %-8s",padding,i+1,j,target->newfilesystem,target->devicepath);

ui_dialog_progress(_("Formatting"),text,get_percent(i+1,j));
Permalink | Reply | 0 comments |
headers
James Buren | 21 May 2013 04:25
Picon

fvbe: block: ignore the usb device we booted from

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=fvbe.git;a=commitdiff;h=9660cd0c71a91eb96dce40151b46ebbc593535d5

commit 9660cd0c71a91eb96dce40151b46ebbc593535d5
Author: James Buren <ryuo@...>
Date:   Mon May 20 21:23:36 2013 -0500

block: ignore the usb device we booted from

diff --git a/src/block.c b/src/block.c
index b47856e..6c79326 100644
--- a/src/block.c
+++ b/src/block.c
 <at>  <at>  -366,7 +366,7  <at>  <at>  extern struct device **device_probe_all(bool disk,bool raid)
else
continue;

-    if((device = device_open(path)) == 0)
+    if(strncmp(path,g->isodevice,8) == 0 || (device = device_open(path)) == 0)
continue;

devices[i++] = device;
Permalink | Reply | 0 comments |
headers
Slown | 20 May 2013 22:06
Picon

frugalware-current: perl-config-inifiles-2.81-1-i686

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=a69ffa4a2a7c9765ab3104f98594b6a0f1f36258

commit a69ffa4a2a7c9765ab3104f98594b6a0f1f36258
Author: Slown <slownlinux@...>
Date:   Mon May 20 21:06:10 2013 +0100

perl-config-inifiles-2.81-1-i686

* version bump

diff --git a/source/devel-extra/perl-config-inifiles/FrugalBuild b/source/devel-extra/perl-config-inifiles/FrugalBuild
index 2dfbb15..77253f4 100644
--- a/source/devel-extra/perl-config-inifiles/FrugalBuild
+++ b/source/devel-extra/perl-config-inifiles/FrugalBuild
 <at>  <at>  -1,14 +1,14  <at>  <at> 
-# Compiling Time: 0.02 SBU
+# Compiling Time: 0.01 SBU
# Maintainer: bouleetbil <bouleetbil@...>

pkgname=perl-config-inifiles
_F_perl_name=Config-IniFiles
_F_perl_author=S/SH/SHLOMIF
-pkgver=2.79
+pkgver=2.81
pkgrel=1
pkgdesc="A module for reading .ini-style configuration files."
depends=('perl-list-moreutils')
groups=('devel-extra')
Finclude perl
archs=('i686' 'x86_64')
(Continue reading)

Permalink | Reply | 0 comments |

Gmane