Ignore:
Timestamp:
Nov 6, 2007, 11:01:53 AM (13 years ago)
Author:
Bruno Cornec
Message:
  • Better output for mindi-busybox revision
  • Remove dummy file created on NFS - report from Arnaud Tiger <arnaud.tiger_at_hp.com>
  • strace useful for debug
  • fix new versions for pb (2.0.0 for mindi and 1.7.2 for mindi-busybox)
  • fix build process for mindi-busybox + options used in that version (dd for label-partitions-as-necessary)
  • fix typo in label-partitions-as-necessary which doesn't seem to work
  • Update to busybox 1.7.2
  • perl is now required at restore time to support uuid swap partitions (and will be used for many other thigs

in the future for sure)

  • next mindi version will be 2.0.0 due to all the changes made in it (udev may break working distros)
  • small optimization in mindi on keyboard handling (one single find instead of multiple)
  • better interaction for USB device when launching mindi manually
  • attempt to automatically guess block disk size for ramdisk
  • fix typos in bkphw
  • Fix the remaining problem with UUID support for swap partitions
  • Updates mondoarchive man page for USB support
  • Adds preliminary Hardware support to mindi (Proliant SSSTK)
  • Tries to add udev support also for rhel4
  • Fix UUID support which was still broken.
  • Be conservative in test for the start-nfs script
  • Update config file for mindi-busybox for 1.7.2 migration
  • Try to run around a busybox bug (1.2.2 pb on inexistant links)
  • Add build content for mindi-busybox in pb
  • Remove distributions content for mindi-busybox
  • Fix a warning on inexistant raidtab
  • Solve problem on tmpfs in restore init (Problem of inexistant symlink and busybox)
  • Create MONDO_CACHE and use it everywhere + creation at start
  • Really never try to eject a USB device
  • Fix a issue with &> usage (replaced with 1> and 2>)
  • Adds magic file to depllist in order to have file working + ldd which helps for debugging issues
  • tty modes correct to avoid sh error messages
  • Use ext3 normally and not ext2 instead
  • USB device should be corrected after reading (take 1st part)
  • Adds a mount_USB_here function derived from mount_CDROM_here
  • usb detection place before /dev detection in device name at restore time
  • Fix when restoring from USB: media is asked in interactive mode
  • Adds USB support for mondorestore
  • mount_cdrom => mount_media
  • elilo.efi is now searched throughout /boot/efi and not in a fixed place as there is no standard
  • untar-and-softlink => untar (+ interface change)
  • suppress useless softlinks creation/removal in boot process
  • avoids udevd messages on groups
  • Increase # of disks to 99 as in mindi at restore time (should be a conf file parameter)
  • skip existing big file creation
  • seems to work correctly for USB mindi boot
  • Adds group and tty link to udev conf
  • Always load usb-torage (even 2.6) to initiate USB bus discovery
  • Better printing of messages
  • Attempt to fix a bug in supporting OpenSusE 10.3 kernel for initramfs (mindi may now use multiple regex for kernel initrd detection)
  • Links were not correctly done as non relative for modules in mindi
  • exclusion of modules denied now works
  • Also create modules in their ordinary place, so that classical modprobe works + copy modules.dep
  • Fix bugs for DENY_MODS handling
  • Add device /dev/console for udev
  • ide-generic should now really be excluded
  • Fix a bug in major number for tty
  • If udev then adds modprobe/insmod to rootfs
  • tty0 is also cretaed with udev
  • ide-generic put rather in DENY_MODS
  • udevd remove from deplist s handled in mindi directly
  • better default for mindi when using --usb
  • Handles dynamically linked busybox (in case we want to use it soon ;-)
  • Adds fixed devices to create for udev
  • ide-generic should not be part of the initrd when using libata v2
  • support a dynamically linked udev (case on Ubuntu 7.10 and Mandriva 2008.0 so should be quite generic) This will give incitation to move to dyn. linked binaries in the initrd which will help for other tasks (ia6 4)
  • Improvement in udev support (do not use cl options not available in busybox)
  • Udev in mindi
    • auto creation of the right links at boot time with udev-links.conf(from Mandriva 2008.0)
    • rework startup of udev as current makes kernel crash (from Mandriva 2008.0)
    • add support for 64 bits udev
  • Try to render MyInsmod? silent at boot time
  • Adds udev support (mandatory for newest distributions to avoid remapping of devices in a different way as on the original system)
  • We also need vaft format support for USB boot
  • Adds libusual support (Ubuntu 7.10 needs it for USB)
  • Improve Ubuntu/Debian? keyboard detection and support
  • pbinit adapted to new pb (0.8.10). Filtering of docs done in it
  • Suppress some mondo warnings and errors on USB again
  • Tries to fix lack of files in deb mindi package
  • Verify should now work for USB devices
  • More log/mesages improvement for USB support
  • - Supress g_erase_tmpdir_and_scratchdir
  • Improve some log messages for USB support
  • Try to improve install in mindi to avoid issues with isolinux.cfg not installed vene if in the pkg :-(
  • Improve mindi-busybox build
  • In conformity with pb 0.8.9
  • Add support for Ubuntu 7.10 in build process
  • Add USB Key button to Menu UI (CD streamer removed)
  • Attempt to fix error messages on tmp/scratch files at the end by removing those dir at the latest possible.
  • Fix a bug linked to the size of the -E param which could be used (Arnaud Tiger/René? Ribaud).
  • Integrate ~/.pbrc content into mondorescue.pb (required project-builder >= 0.8.7)
  • Put mondorescue in conformity with new pb filtering rules
  • Add USB support at restore time (no test done yet). New start-usb script PB varibale added where useful
  • Unmounting USB device before removal of temporary scratchdir
  • Stil refining USB copy back to mondo (one command was not executed)
  • No need to have the image subdor in the csratchdir when USB.
  • umount the USB partition before attempting to use it
  • Remove useless copy from mindi to mondo at end of USB handling

(risky merge, we are raising the limits of 2 diverging branches. The status of stable is not completely sure as such. Will need lots of tests, but it's not yet done :-()
(merge -r1692:1769 $SVN_M/branches/2.2.5)

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/stable/mindi-busybox/util-linux/hwclock.c

    r821 r1770  
    88*/
    99
    10 
    11 #include <sys/ioctl.h>
    1210#include <sys/utsname.h>
    13 #include <ctype.h>
    14 #include <fcntl.h>
    1511#include <getopt.h>
    16 #include <stdlib.h>
    17 #include <string.h>
    18 #include <syslog.h>
    19 #include <time.h>
    20 #include <unistd.h>
    21 #include "busybox.h"
     12#include "libbb.h"
    2213
    2314/* Copied from linux/rtc.h to eliminate the kernel dependency */
     
    4334#endif
    4435
     36static const char *rtcname;
     37
     38static int xopen_rtc(int flags)
     39{
     40    int rtc;
     41
     42    if (!rtcname) {
     43        rtc = open("/dev/rtc", flags);
     44        if (rtc >= 0)
     45            return rtc;
     46        rtc = open("/dev/rtc0", flags);
     47        if (rtc >= 0)
     48            return rtc;
     49        rtcname = "/dev/misc/rtc";
     50    }
     51    return xopen(rtcname, flags);
     52}
     53
    4554static time_t read_rtc(int utc)
    4655{
    47     int rtc;
    4856    struct tm tm;
    4957    char *oldtz = 0;
    5058    time_t t = 0;
    51 
    52     if (( rtc = open ( "/dev/rtc", O_RDONLY )) < 0 ) {
    53         if (( rtc = open ( "/dev/misc/rtc", O_RDONLY )) < 0 )
    54             bb_perror_msg_and_die ( "Could not access RTC" );
    55     }
    56     memset ( &tm, 0, sizeof( struct tm ));
    57     if ( ioctl ( rtc, RTC_RD_TIME, &tm ) < 0 )
    58         bb_perror_msg_and_die ( "Could not read time from RTC" );
     59    int rtc = xopen_rtc(O_RDONLY);
     60
     61    memset(&tm, 0, sizeof(struct tm));
     62    xioctl(rtc, RTC_RD_TIME, &tm);
    5963    tm.tm_isdst = -1; /* not known */
    6064
    61     close ( rtc );
    62 
    63     if ( utc ) {
    64         oldtz = getenv ( "TZ" );
    65         setenv ( "TZ", "UTC 0", 1 );
    66         tzset ( );
    67     }
    68 
    69     t = mktime ( &tm );
    70 
    71     if ( utc ) {
    72         if ( oldtz )
    73             setenv ( "TZ", oldtz, 1 );
    74         else
    75             unsetenv ( "TZ" );
    76         tzset ( );
     65    close(rtc);
     66
     67    if (utc) {
     68        oldtz = getenv("TZ");
     69        putenv((char*)"TZ=UTC0");
     70        tzset();
     71    }
     72
     73    t = mktime(&tm);
     74
     75    if (utc) {
     76        unsetenv("TZ");
     77        if (oldtz)
     78            putenv(oldtz - 3);
     79        tzset();
    7780    }
    7881    return t;
     
    8184static void write_rtc(time_t t, int utc)
    8285{
    83     int rtc;
    8486    struct tm tm;
    85 
    86     if (( rtc = open ( "/dev/rtc", O_WRONLY )) < 0 ) {
    87         if (( rtc = open ( "/dev/misc/rtc", O_WRONLY )) < 0 )
    88             bb_perror_msg_and_die ( "Could not access RTC" );
    89     }
    90 
    91     tm = *( utc ? gmtime ( &t ) : localtime ( &t ));
     87    int rtc = xopen_rtc(O_WRONLY);
     88
     89    tm = *(utc ? gmtime(&t) : localtime(&t));
    9290    tm.tm_isdst = 0;
    9391
    94     if ( ioctl ( rtc, RTC_SET_TIME, &tm ) < 0 )
    95         bb_perror_msg_and_die ( "Could not set the RTC time" );
    96 
    97     close ( rtc );
    98 }
    99 
    100 static int show_clock(int utc)
    101 {
    102     struct tm *ptm;
     92    xioctl(rtc, RTC_SET_TIME, &tm);
     93
     94    close(rtc);
     95}
     96
     97static void show_clock(int utc)
     98{
     99    //struct tm *ptm;
    103100    time_t t;
    104     RESERVE_CONFIG_BUFFER(buffer, 64);
    105 
    106     t = read_rtc ( utc );
    107     ptm = localtime ( &t );  /* Sets 'tzname[]' */
    108 
    109     safe_strncpy ( buffer, ctime ( &t ), 64);
    110     if ( buffer [0] )
    111         buffer [strlen ( buffer ) - 1] = 0;
    112 
    113     //printf ( "%s  %.6f seconds %s\n", buffer, 0.0, utc ? "" : ( ptm-> tm_isdst ? tzname [1] : tzname [0] ));
    114     printf ( "%s  %.6f seconds\n", buffer, 0.0 );
    115     RELEASE_CONFIG_BUFFER(buffer);
    116 
    117     return 0;
    118 }
    119 
    120 static int to_sys_clock(int utc)
    121 {
    122     struct timeval tv = { 0, 0 };
     101    char *cp;
     102
     103    t = read_rtc(utc);
     104    //ptm = localtime(&t);  /* Sets 'tzname[]' */
     105
     106    cp = ctime(&t);
     107    if (cp[0])
     108        cp[strlen(cp) - 1] = '\0';
     109
     110    //printf("%s  %.6f seconds %s\n", cp, 0.0, utc ? "" : (ptm->tm_isdst ? tzname[1] : tzname[0]));
     111    printf("%s  0.000000 seconds\n", cp);
     112}
     113
     114static void to_sys_clock(int utc)
     115{
     116    struct timeval tv;
    123117    const struct timezone tz = { timezone/60 - 60*daylight, 0 };
    124118
    125     tv.tv_sec = read_rtc ( utc );
    126 
    127     if ( settimeofday ( &tv, &tz ))
    128         bb_perror_msg_and_die ( "settimeofday() failed" );
    129 
    130     return 0;
    131 }
    132 
    133 static int from_sys_clock(int utc)
    134 {
    135     struct timeval tv = { 0, 0 };
    136     struct timezone tz = { 0, 0 };
    137 
    138     if ( gettimeofday ( &tv, &tz ))
    139         bb_perror_msg_and_die ( "gettimeofday() failed" );
    140 
    141     write_rtc ( tv.tv_sec, utc );
    142     return 0;
    143 }
    144 
    145 #ifdef CONFIG_FEATURE_HWCLOCK_ADJTIME_FHS
     119    tv.tv_sec = read_rtc(utc);
     120    tv.tv_usec = 0;
     121    if (settimeofday(&tv, &tz))
     122        bb_perror_msg_and_die("settimeofday() failed");
     123}
     124
     125static void from_sys_clock(int utc)
     126{
     127    struct timeval tv;
     128
     129    gettimeofday(&tv, NULL);
     130    //if (gettimeofday(&tv, NULL))
     131    //  bb_perror_msg_and_die("gettimeofday() failed");
     132    write_rtc(tv.tv_sec, utc);
     133}
     134
     135#if ENABLE_FEATURE_HWCLOCK_ADJTIME_FHS
    146136# define ADJTIME_PATH "/var/lib/hwclock/adjtime"
    147137#else
     
    151141{
    152142    int utc = 0;
    153     FILE *f = fopen ( ADJTIME_PATH, "r" );
    154 
    155     if ( f ) {
     143    FILE *f = fopen(ADJTIME_PATH, "r");
     144
     145    if (f) {
    156146        RESERVE_CONFIG_BUFFER(buffer, 128);
    157147
    158         while ( fgets ( buffer, sizeof( buffer ), f )) {
    159             int len = strlen ( buffer );
    160 
    161             while ( len && isspace ( buffer [len - 1] ))
     148        while (fgets(buffer, sizeof(buffer), f)) {
     149            int len = strlen(buffer);
     150
     151            while (len && isspace(buffer[len - 1]))
    162152                len--;
    163153
    164             buffer [len] = 0;
    165 
    166             if ( strncmp ( buffer, "UTC", 3 ) == 0 ) {
     154            buffer[len] = 0;
     155
     156            if (strncmp(buffer, "UTC", 3) == 0) {
    167157                utc = 1;
    168158                break;
    169159            }
    170160        }
    171         fclose ( f );
     161        fclose(f);
    172162        RELEASE_CONFIG_BUFFER(buffer);
    173163    }
     
    175165}
    176166
    177 #define HWCLOCK_OPT_LOCALTIME   0x01
    178 #define HWCLOCK_OPT_UTC         0x02
    179 #define HWCLOCK_OPT_SHOW        0x04
    180 #define HWCLOCK_OPT_HCTOSYS     0x08
    181 #define HWCLOCK_OPT_SYSTOHC     0x10
    182 
    183 int hwclock_main ( int argc, char **argv )
    184 {
    185     unsigned long opt;
     167#define HWCLOCK_OPT_LOCALTIME   0x01
     168#define HWCLOCK_OPT_UTC         0x02
     169#define HWCLOCK_OPT_SHOW        0x04
     170#define HWCLOCK_OPT_HCTOSYS     0x08
     171#define HWCLOCK_OPT_SYSTOHC     0x10
     172#define HWCLOCK_OPT_RTCFILE     0x20
     173
     174int hwclock_main(int argc, char **argv);
     175int hwclock_main(int argc, char **argv)
     176{
     177    unsigned opt;
    186178    int utc;
    187179
    188180#if ENABLE_FEATURE_HWCLOCK_LONG_OPTIONS
    189 static const struct option hwclock_long_options[] = {
    190         { "localtime", 0, 0, 'l' },
    191         { "utc",       0, 0, 'u' },
    192         { "show",      0, 0, 'r' },
    193         { "hctosys",   0, 0, 's' },
    194         { "systohc",   0, 0, 'w' },
    195         { 0,           0, 0, 0 }
    196     };
    197     bb_applet_long_options = hwclock_long_options;
     181    static const char hwclock_longopts[] ALIGN1 =
     182        "localtime\0" No_argument "l"
     183        "utc\0"       No_argument "u"
     184        "show\0"      No_argument "r"
     185        "hctosys\0"   No_argument "s"
     186        "systohc\0"   No_argument "w"
     187        "file\0"      Required_argument "f"
     188        ;
     189    applet_long_options = hwclock_longopts;
    198190#endif
    199 
    200     bb_opt_complementally = "?:r--ws:w--rs:s--wr:l--u:u--l";
    201     opt = bb_getopt_ulflags(argc, argv, "lursw");
     191    opt_complementary = "r--ws:w--rs:s--wr:l--u:u--l";
     192    opt = getopt32(argv, "lurswf:", &rtcname);
    202193
    203194    /* If -u or -l wasn't given check if we are using utc */
     
    208199
    209200    if (opt & HWCLOCK_OPT_HCTOSYS) {
    210         return to_sys_clock ( utc );
    211     }
    212     else if (opt & HWCLOCK_OPT_SYSTOHC) {
    213         return from_sys_clock ( utc );
    214     } else {
    215         /* default HWCLOCK_OPT_SHOW */
    216         return show_clock ( utc );
    217     }
    218 }
     201        to_sys_clock(utc);
     202        return 0;
     203    }
     204    if (opt & HWCLOCK_OPT_SYSTOHC) {
     205        from_sys_clock(utc);
     206        return 0;
     207    }
     208    /* default HWCLOCK_OPT_SHOW */
     209    show_clock(utc);
     210    return 0;
     211}
Note: See TracChangeset for help on using the changeset viewer.