[systemd-devel] [systemd-commits] .gitignore Makefile.am man/machine-id.xml src/machine-id-main.c src/machine-id-setup.c src/machine-id-setup.h src/main.c

[Gustavo Sverzut Barbieri]

Forget what I said, i checked it from the phone and messed the doc
with the file contents!

:) and sorry about 2 top posts

On Saturday, March 5, 2011, Gustavo Sverzut Barbieri
<barbieri at profusion.mobi> wrote:
> Oh man, XML?
>
> Ok, this one is pretty parseable with sed or custom code, but couldn't
> u keep it as an ini file as systemd units?
>
> On Friday, March 4, 2011, Lennart Poettering
> <lennart at kemper.freedesktop.org> wrote:
>>  .gitignore             |    1
>>  Makefile.am            |   15 ++++
>>  man/machine-id.xml     |  104 ++++++++++++++++++++++++++++++
>>  src/machine-id-main.c  |   35 ++++++++++
>>  src/machine-id-setup.c |  166 +++++++++++++++++++++++++++++++++++++++++++++++++
>>  src/machine-id-setup.h |   27 +++++++
>>  src/main.c             |    2
>>  7 files changed, 349 insertions(+), 1 deletion(-)
>>
>> New commits:
>> commit d7ccca2e3f86feb81a48e243d8bad78814659a74
>> Author: Lennart Poettering <lennart at poettering.net>
>> Date:   Fri Mar 4 21:53:19 2011 +0100
>>
>>     main: introduce /etc/machine-id
>>
>>     This is supposed to play the same roles /var/lib/dbus/machine-id,
>>     however fixes a couple of problems:
>>
>>     - It is available during early boot since it is stored in /etc
>>
>>     - Removes the ID from the D-Bus context and moves it into a system
>>       context, thus hopefully lowering hesitation by people to use it.
>>
>>     - It is generated at installation time. If the file is empty at boot
>>       time it will be mounted over with a randomly generated ID, which is
>>       not saved to disk. This is useful to support state-less machines with
>>       no transient or writable /etc configuration.
>>
>> diff --git a/.gitignore b/.gitignore
>> index adee97f..c5bb575 100644
>> --- a/.gitignore
>> +++ b/.gitignore
>> @@ -1,3 +1,4 @@
>> +systemd-machine-id-setup
>>  systemd-detect-virt
>>  systemd-sysctl
>>  test-strv
>> diff --git a/Makefile.am b/Makefile.am
>> index 1841ad5..3d32df2 100644
>> --- a/Makefile.am
>> +++ b/Makefile.am
>> @@ -98,7 +98,8 @@ rootbin_PROGRAMS = \
>>         systemd-notify \
>>         systemd-ask-password \
>>         systemd-tty-ask-password-agent \
>> -       systemd-tmpfiles
>> +       systemd-tmpfiles \
>> +       systemd-machine-id-setup
>>
>>  bin_PROGRAMS = \
>>         systemd-cgls
>> @@ -434,6 +435,7 @@ libsystemd_core_la_SOURCES = \
>>         src/loopback-setup.c \
>>         src/kmod-setup.c \
>>         src/locale-setup.c \
>> +       src/machine-id-setup.c \
>>         src/specifier.c \
>>         src/unit-name.c \
>>         src/fdset.c \
>> @@ -523,6 +525,7 @@ MANPAGES = \
>>         man/systemd.conf.5 \
>>         man/tmpfiles.d.5 \
>>         man/hostname.5 \
>> +       man/machine-id.5 \
>>         man/vconsole.conf.5 \
>>         man/locale.conf.5 \
>>         man/os-release.5 \
>> @@ -737,6 +740,16 @@ systemd_tmpfiles_CFLAGS = \
>>  systemd_tmpfiles_LDADD = \
>>         libsystemd-basic.la
>>
>> +systemd_machine_id_setup_SOURCES = \
>> +       src/machine-id-setup.c \
>> +       src/machine-id-main.c
>> +
>> +systemd_machine_id_setup_CFLAGS = \
>> +       $(AM_CFLAGS)
>> +
>> +systemd_machine_id_setup_LDADD = \
>> +       libsystemd-basic.la
>> +
>>  systemd_sysctl_SOURCES = \
>>         src/sysctl.c
>>
>> diff --git a/man/machine-id.xml b/man/machine-id.xml
>> new file mode 100644
>> index 0000000..fefeb66
>> --- /dev/null
>> +++ b/man/machine-id.xml
>> @@ -0,0 +1,104 @@
>> +<?xml version='1.0'?> <--
> Gustavo Sverzut Barbieri
> http://profusion.mobi embedded systems
> --------------------------------------
> MSN: barbieri at gmail.com
> Skype: gsbarbieri
> Mobile: +55 (19) 9225-2202
>

-- 
Gustavo Sverzut Barbieri
http://profusion.mobi embedded systems
--------------------------------------
MSN: barbieri at gmail.com
Skype: gsbarbieri
Mobile: +55 (19) 9225-2202